---

yaml
---
r: 60636
b: refs/heads/auto
c: 14be4c2
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b8be7e8329fdf819d413d0bf82146c138edff2bb
+refs/heads/auto: 14be4c23e46144026efaa1fa0155f6407326747e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustdoc/config.rs

@@ -14,7 +14,7 @@ use core::cell::Cell;
 use core::run;
 use core::run::ProgramOutput;
 use core::result::Result;
-use std::getopts;
+use extra::getopts;
 
 /// The type of document to output
 #[deriving(Eq)]

branches/auto/src/librustdoc/markdown_writer.rs

@@ -17,7 +17,7 @@ use doc;
 use core::libc;
 use core::run;
 use core::comm::*;
-use std::future;
+use extra::future;
 
 pub enum WriteInstr {
     Write(~str),

branches/auto/src/librustdoc/rustdoc.rc

@@ -24,7 +24,7 @@
 #[no_std];
 
 extern mod core(name = "std");
-extern mod std(name = "extra");
+extern mod extra(name = "extra");
 
 extern mod rustc;
 extern mod syntax;
@@ -145,9 +145,9 @@ fn run(config: Config) {
 }
 
 pub fn time<T>(what: ~str, f: &fn() -> T) -> T {
-    let start = std::time::precise_time_s();
+    let start = extra::time::precise_time_s();
     let rv = f();
-    let end = std::time::precise_time_s();
+    let end = extra::time::precise_time_s();
     info!("time: %3.3f s    %s", end - start, what);
     rv
 }

branches/auto/src/librustdoc/sort_pass.rs

@@ -19,7 +19,7 @@ use util::NominalOp;
 
 #[cfg(test)] use extract;
 
-use std::sort;
+use extra::sort;
 
 pub type ItemLtEqOp = @fn(v1: &doc::ItemTag, v2:  &doc::ItemTag) -> bool;