From 14be4c23e46144026efaa1fa0155f6407326747e Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Sun, 19 May 2013 11:17:49 -0700 Subject: [PATCH] librustdoc: Rename `std` to `extra`. --- src/librustdoc/config.rs | 2 +- src/librustdoc/markdown_writer.rs | 2 +- src/librustdoc/rustdoc.rc | 6 +++--- src/librustdoc/sort_pass.rs | 2 +- 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(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;