diff --git a/Cargo.lock b/Cargo.lock index fb69826ceca..aab3cb77dd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,6 @@ dependencies = [ "tar 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -414,16 +413,6 @@ dependencies = [ "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "time" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "toml" version = "0.1.28" diff --git a/Cargo.toml b/Cargo.toml index c3a4c48c2a3..6560c9ee320 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,6 @@ semver = "0.2.2" tar = "0.4" tempdir = "0.3" term = "0.4.4" -time = "0.1" toml = "0.1" url = "1.1" winapi = "0.2" diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index c1012bc40d0..c20b150dfcd 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -22,7 +22,6 @@ extern crate semver; extern crate tar; extern crate tempdir; extern crate term; -extern crate time; extern crate toml; extern crate url; diff --git a/src/cargo/util/profile.rs b/src/cargo/util/profile.rs index 59cc83f45dc..5810f518369 100644 --- a/src/cargo/util/profile.rs +++ b/src/cargo/util/profile.rs @@ -1,11 +1,11 @@ use std::env; use std::fmt; use std::mem; -use time; +use std::time; use std::iter::repeat; use std::cell::RefCell; -thread_local!(static PROFILE_STACK: RefCell> = RefCell::new(Vec::new())); +thread_local!(static PROFILE_STACK: RefCell> = RefCell::new(Vec::new())); thread_local!(static MESSAGES: RefCell> = RefCell::new(Vec::new())); type Message = (usize, u64, String); @@ -21,7 +21,7 @@ fn enabled_level() -> Option { pub fn start(desc: T) -> Profiler { if enabled_level().is_none() { return Profiler { desc: String::new() } } - PROFILE_STACK.with(|stack| stack.borrow_mut().push(time::precise_time_ns())); + PROFILE_STACK.with(|stack| stack.borrow_mut().push(time::Instant::now())); Profiler { desc: desc.to_string(), @@ -36,7 +36,8 @@ impl Drop for Profiler { }; let start = PROFILE_STACK.with(|stack| stack.borrow_mut().pop().unwrap()); - let end = time::precise_time_ns(); + let duration = start.elapsed(); + let duration_ms = duration.as_secs() * 1000 + (duration.subsec_nanos() / 1000000) as u64; let stack_len = PROFILE_STACK.with(|stack| stack.borrow().len()); if stack_len == 0 { @@ -47,7 +48,7 @@ impl Drop for Profiler { if l != lvl { continue } println!("{} {:6}ms - {}", repeat(" ").take(lvl + 1).collect::(), - time / 1000000, msg); + time, msg); print(lvl + 1, &msgs[last..i], enabled); last = i; @@ -56,14 +57,14 @@ impl Drop for Profiler { } MESSAGES.with(|msgs_rc| { let mut msgs = msgs_rc.borrow_mut(); - msgs.push((0, end - start, + msgs.push((0, duration_ms, mem::replace(&mut self.desc, String::new()))); print(0, &msgs, enabled); }); } else { MESSAGES.with(|msgs| { let msg = mem::replace(&mut self.desc, String::new()); - msgs.borrow_mut().push((stack_len, end - start, msg)); + msgs.borrow_mut().push((stack_len, duration_ms, msg)); }); } }