auto merge of #9636 : alexcrichton/rust/rustdoc, r=huonw

Commits have all the juicy details.

Import thing to note in this pull request is that `rustdoc html crate.rs` becomes `rustdoc crate.rs`

diff --cc src/librustdoc/html/render.rs
Simple merge

diff --cc src/librustdoc/rustdoc.rs
index 57aa62d313cc73442a6ab04c23518eb65bab4ab4,61a27e49f6663dbc1778f22717e119ae973f9732..a7eac9f268d3c70003601b3b09f00453b17a1e33
--- 1/src/librustdoc/rustdoc.rs
--- 2/src/librustdoc/rustdoc.rs
+++ b/src/librustdoc/rustdoc.rs
@@@ -234,11 -302,11 +302,11 @@@ fn json_output(crate: clean::Crate, res
      // FIXME #8335: yuck, Rust -> str -> JSON round trip! No way to .encode
      // straight to the Rust JSON representation.
      let crate_json_str = do std::io::with_str_writer |w| {
-         crate.encode(&mut extra::json::Encoder(w));
+         crate.encode(&mut json::Encoder(w));
      };
-     let crate_json = match extra::json::from_str(crate_json_str) {
+     let crate_json = match json::from_str(crate_json_str) {
          Ok(j) => j,
 -        Err(_) => fail!("Rust generated JSON is invalid??")
 +        Err(_) => fail2!("Rust generated JSON is invalid??")
      };
  
      json.insert(~"crate", crate_json);