auto merge of #14764 : jbcrail/rust/fix-more-comments, r=alexcrichton

diff --combined src/libgreen/context.rs
index e377c203e30737cffaa306dd168701bca0bcd89a,9c7ad18454344a4234561f7551ed42612acbc6b6..9071656f21334c896c60c0891977cf0f8196047a
--- 1/src/libgreen/context.rs
--- 2/src/libgreen/context.rs
+++ b/src/libgreen/context.rs
@@@ -143,7 -143,6 +143,7 @@@ extern 
  // stacks are disabled.
  
  #[cfg(target_arch = "x86")]
 +#[repr(C)]
  struct Registers {
      eax: u32, ebx: u32, ecx: u32, edx: u32,
      ebp: u32, esi: u32, edi: u32, esp: u32,
@@@ -227,7 -226,7 +227,7 @@@ fn initialize_call_frame(regs: &mut Reg
      regs[RUSTRT_R14] = procedure.env as uint;
      regs[RUSTRT_R15] = fptr as uint;
  
-     // These registers are picked up by the regulard context switch paths. These
+     // These registers are picked up by the regular context switch paths. These
      // will put us in "mostly the right context" except for frobbing all the
      // arguments to the right place. We have the small trampoline code inside of
      // rust_bootstrap_green_task to do that.

diff --combined src/librustc/middle/trans/base.rs
index 1cc490bf8f8ac66079d5a969c88e5193b60d8513,4814bf5bffcf010bb3939b581464c7f118473336..fc2e87f72bb49387faf3b38c95f6f024c6613afd
--- 1/src/librustc/middle/trans/base.rs
--- 2/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@@ -106,9 -106,7 +106,9 @@@ pub fn init_insn_ctxt() 
      task_local_insn_key.replace(Some(RefCell::new(Vec::new())));
  }
  
 -pub struct _InsnCtxt { _x: () }
 +pub struct _InsnCtxt {
 +    _cannot_construct_outside_of_this_module: ()
 +}
  
  #[unsafe_destructor]
  impl Drop for _InsnCtxt {
@@@ -126,7 -124,7 +126,7 @@@ pub fn push_ctxt(s: &'static str) -> _I
          Some(ctx) => ctx.borrow_mut().push(s),
          None => {}
      }
 -    _InsnCtxt { _x: () }
 +    _InsnCtxt { _cannot_construct_outside_of_this_module: () }
  }
  
  pub struct StatRecorder<'a> {
@@@ -1573,7 -1571,7 +1573,7 @@@ fn enum_variant_size_lint(ccx: &CrateCo
                  for var in variants.iter() {
                      let mut size = 0;
                      for field in var.fields.iter().skip(1) {
-                         // skip the dicriminant
+                         // skip the discriminant
                          size += llsize_of_real(ccx, sizing_type_of(ccx, *field));
                      }
                      sizes.push(size);
@@@ -2320,7 -2318,7 +2320,7 @@@ pub fn trans_crate(krate: ast::Crate
      // LLVM code generator emits a ".file filename" directive
      // for ELF backends. Value of the "filename" is set as the
      // LLVM module identifier.  Due to a LLVM MC bug[1], LLVM
-     // crashes if the module identifer is same as other symbols
+     // crashes if the module identifier is same as other symbols
      // such as a function name in the module.
      // 1. http://llvm.org/bugs/show_bug.cgi?id=11479
      let mut llmod_id = link_meta.crateid.name.clone();

diff --combined src/librustc/middle/typeck/variance.rs
index 92ebf42c7af98088a4ba5e2164ebcda817e88de9,961625fadefcc1fc4cb68b1f0eb988f26890d8b8..04d7781668cc78753f628be38ebf6db616cecd89
--- 1/src/librustc/middle/typeck/variance.rs
--- 2/src/librustc/middle/typeck/variance.rs
+++ b/src/librustc/middle/typeck/variance.rs
@@@ -271,6 -271,7 +271,6 @@@ enum ParamKind { TypeParam, RegionParam
  struct InferredInfo<'a> {
      item_id: ast::NodeId,
      kind: ParamKind,
 -    index: uint,
      param_id: ast::NodeId,
      term: VarianceTermPtr<'a>,
  }
@@@ -309,6 -310,7 +309,6 @@@ impl<'a> TermsContext<'a> 
          let term = self.arena.alloc(|| InferredTerm(inf_index));
          self.inferred_infos.push(InferredInfo { item_id: item_id,
                                                  kind: kind,
 -                                                index: index,
                                                  param_id: param_id,
                                                  term: term });
          let newly_added = self.inferred_map.insert(param_id, inf_index);
@@@ -483,7 -485,7 +483,7 @@@ impl<'a> Visitor<()> for ConstraintCont
                      let variant =
                          ty::VariantInfo::from_ast_variant(tcx,
                                                            ast_variant,
-                                                           /*discrimant*/ 0);
+                                                           /*discriminant*/ 0);
                      for &arg_ty in variant.args.iter() {
                          self.add_constraints_from_ty(arg_ty, self.covariant);
                      }

diff --combined src/librustdoc/html/markdown.rs
index 061c05058ae367d84871dcd504e06528741cc3ad,83f99fc881b7141d1f1c0ef84f68acc1f798d9fc..6f9a8062be88fe5b6d0ecd27835b7c144bf947ad
--- 1/src/librustdoc/html/markdown.rs
--- 2/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@@ -24,7 -24,6 +24,7 @@@
  //! // ... something using html
  //! ```
  
 +#![allow(dead_code)]
  #![allow(non_camel_case_types)]
  
  use libc;
@@@ -391,7 -390,7 +391,7 @@@ fn parse_lang_string(string: &str) -> (
  }
  
  /// By default this markdown renderer generates anchors for each header in the
- /// rendered document. The anchor name is the contents of the header spearated
+ /// rendered document. The anchor name is the contents of the header separated
  /// by hyphens, and a task-local map is used to disambiguate among duplicate
  /// headers (numbers are appended).
  ///