Move time out of extra (cc #8784)

Author: Arcterus

AUTHORS.txt

@@ -7,6 +7,7 @@ Adrien Tétar <[email protected]>
 Alan Andrade <[email protected]>
 Aleksander Balicki <[email protected]>
 Alex Crichton <[email protected]>
+Alex Lyon <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Alexander Stavonin <[email protected]>
 Alexandros Tasos <[email protected]>

mk/crates.mk

@@ -50,21 +50,21 @@
 ################################################################################
 
 TARGET_CRATES := std extra green rustuv native flate arena glob term semver \
-                 uuid serialize sync getopts collections num test
+                 uuid serialize sync getopts collections num test time
 HOST_CRATES := syntax rustc rustdoc fourcc
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
 DEPS_std := native:rustrt native:compiler-rt
-DEPS_extra := std term sync serialize getopts collections
+DEPS_extra := std term sync serialize getopts collections time
 DEPS_green := std native:context_switch
 DEPS_rustuv := std native:uv native:uv_support
 DEPS_native := std
 DEPS_syntax := std term serialize collections
 DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
-              collections extra
+              collections time extra
 DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
-                test
+                test time
 DEPS_flate := std native:miniz
 DEPS_arena := std collections
 DEPS_glob := std
@@ -78,6 +78,7 @@ DEPS_collections := std serialize
 DEPS_fourcc := syntax std
 DEPS_num := std extra
 DEPS_test := std extra collections getopts serialize term
+DEPS_time := std serialize
 
 TOOL_DEPS_compiletest := test green rustuv getopts
 TOOL_DEPS_rustdoc := rustdoc green rustuv

src/doc/rust.md

@@ -875,14 +875,14 @@ An example of what will and will not work for `use` items:
 
 ~~~~
 # #[allow(unused_imports)];
-use foo::extra;          // good: foo is at the root of the crate
+use foo::extra::json;    // good: foo is at the root of the crate
 use foo::baz::foobaz;    // good: foo is at the root of the crate
 
 mod foo {
     extern crate extra;
 
-    use foo::extra::time;  // good: foo is at crate root
-//  use extra::*;          // bad:  extra is not at the crate root
+    use foo::extra::json;  // good: foo is at crate root
+//  use extra::json::*;    // bad:  extra is not at the crate root
     use self::baz::foobaz; // good: self refers to module 'foo'
     use foo::bar::foobar;  // good: foo is at crate root
 

src/libextra/lib.rs

@@ -37,13 +37,13 @@ Rust extras are part of the standard Rust distribution.
 extern crate sync;
 extern crate serialize;
 extern crate collections;
+extern crate time;
 
 // Utility modules
 pub mod c_vec;
 pub mod url;
 pub mod json;
 pub mod tempfile;
-pub mod time;
 pub mod workcache;
 pub mod stats;
 

src/librustc/lib.rs

@@ -39,6 +39,7 @@ extern crate serialize;
 extern crate sync;
 extern crate getopts;
 extern crate collections;
+extern crate time;
 
 use back::link;
 use driver::session;

src/librustc/metadata/loader.rs

@@ -32,7 +32,9 @@ use std::io;
 use std::os::consts::{macos, freebsd, linux, android, win32};
 use std::str;
 use std::vec;
+
 use flate;
+use time;
 
 pub enum Os {
     OsMacos,
@@ -361,7 +363,6 @@ impl ArchiveMetadata {
 
 // Just a small wrapper to time how long reading metadata takes.
 fn get_metadata_section(os: Os, filename: &Path) -> Option<MetadataBlob> {
-    use extra::time;
     let start = time::precise_time_ns();
     let ret = get_metadata_section_imp(os, filename);
     info!("reading {} => {}ms", filename.filename_display(),

src/librustc/middle/trans/base.rs

@@ -72,7 +72,6 @@ use util::ppaux::{Repr, ty_to_str};
 use util::sha2::Sha256;
 
 use arena::TypedArena;
-use extra::time;
 use std::c_str::ToCStr;
 use std::cell::{Cell, RefCell};
 use std::hashmap::HashMap;
@@ -90,6 +89,8 @@ use syntax::visit::Visitor;
 use syntax::visit;
 use syntax::{ast, ast_util, ast_map};
 
+use time;
+
 pub use middle::trans::context::task_llcx;
 
 local_data_key!(task_local_insn_key: ~[&'static str])

src/librustc/util/common.rs

@@ -16,7 +16,8 @@ use syntax::visit;
 use syntax::visit::Visitor;
 
 use std::local_data;
-use extra::time;
+
+use time;
 
 pub fn time<T, U>(do_it: bool, what: &str, u: U, f: |U| -> T) -> T {
     local_data_key!(depth: uint);

src/librustdoc/lib.rs

@@ -24,14 +24,14 @@ extern crate sync;
 extern crate getopts;
 extern crate collections;
 extern crate testing = "test";
+extern crate time;
 
 use std::local_data;
 use std::io;
 use std::io::{File, MemWriter};
 use std::str;
 use extra::json;
 use serialize::{Decodable, Encodable};
-use extra::time;
 
 pub mod clean;
 pub mod core;

src/libtest/lib.rs

@@ -26,13 +26,14 @@ extern crate extra;
 extern crate getopts;
 extern crate serialize;
 extern crate term;
+extern crate time;
 
 use collections::TreeMap;
 use extra::json::ToJson;
 use extra::json;
 use extra::stats::Stats;
 use extra::stats;
-use extra::time::precise_time_ns;
+use time::precise_time_ns;
 use getopts::{OptGroup, optflag, optopt};
 use serialize::Decodable;
 use term::Terminal;