Merge remote-tracking branch 'origin/master' into gen

src/librustdoc/html/highlight.rs

@@ -106,7 +106,7 @@ pub enum Class {
 }
 
 /// Trait that controls writing the output of syntax highlighting. Users should
-/// implement this trait to customise writing output.
+/// implement this trait to customize writing output.
 ///
 /// The classifier will call into the `Writer` implementation as it finds spans
 /// of text to highlight. Exactly how that text should be highlighted is up to

src/librustdoc/html/static/main.js

@@ -596,9 +596,9 @@
             }
 
             return {
-                raw,
-                query,
-                type,
+                raw: raw,
+                query: query,
+                type: type,
                 id: query + type
             };
         }
@@ -837,7 +837,7 @@
 
                 searchWords.push(crate);
                 searchIndex.push({
-                    crate,
+                    crate: crate,
                     ty: 1, // == ExternCrate
                     name: crate,
                     path: "",

src/librustdoc/html/toc.rs

@@ -95,7 +95,7 @@ impl TocBuilder {
     /// self.top_level, D is in C.children, and C, E, F, G are in
     /// self.chain.
     ///
-    /// When we attempt to push H, we realise that first G is not the
+    /// When we attempt to push H, we realize that first G is not the
     /// parent (level is too high) so it is popped from chain and put
     /// into F.children, then F isn't the parent (level is equal, aka
     /// sibling), so it's also popped and put into E.children.

src/librustdoc/lib.rs

@@ -400,7 +400,7 @@ pub fn main_args(args: &[String]) -> isize {
     })
 }
 
-/// Prints an uniformised error message on the standard error output
+/// Prints an uniformized error message on the standard error output
 fn print_error<T>(error_message: T) where T: Display {
     writeln!(
         &mut io::stderr(),