about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-05-19 11:17:49 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-05-22 21:57:08 -0700
commit14be4c23e46144026efaa1fa0155f6407326747e (patch)
tree7ee78b4536e7f562f800bb3386b1414c94775a0f
parentb8be7e8329fdf819d413d0bf82146c138edff2bb (diff)
downloadrust-14be4c23e46144026efaa1fa0155f6407326747e.tar.gz
rust-14be4c23e46144026efaa1fa0155f6407326747e.zip
librustdoc: Rename `std` to `extra`.
-rw-r--r--src/librustdoc/config.rs2
-rw-r--r--src/librustdoc/markdown_writer.rs2
-rw-r--r--src/librustdoc/rustdoc.rc6
-rw-r--r--src/librustdoc/sort_pass.rs2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 85ceb6cccb7..22a5f668c70 100644
--- a/src/librustdoc/config.rs
+++ b/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)]
diff --git a/src/librustdoc/markdown_writer.rs b/src/librustdoc/markdown_writer.rs
index b585b294b0d..5a22a56b7a6 100644
--- a/src/librustdoc/markdown_writer.rs
+++ b/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),
diff --git a/src/librustdoc/rustdoc.rc b/src/librustdoc/rustdoc.rc
index 9b73e393cb2..d4a25f6eb8b 100644
--- a/src/librustdoc/rustdoc.rc
+++ b/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
 }
diff --git a/src/librustdoc/sort_pass.rs b/src/librustdoc/sort_pass.rs
index 72abbd2bdbd..2c545f7d2be 100644
--- a/src/librustdoc/sort_pass.rs
+++ b/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;