Merge branch 'master' into simd-stringify-struct

Cargo.toml

@@ -12,7 +12,6 @@ jemallocator = "0.5"
 rustc-serialize = { version = "0.3", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }
-time = "0.3"
 simd-json = { version = "0.7", optional = true }
 simd-json-derive = { version = "0.7", optional = true }
 

src/lib.rs

@@ -43,6 +43,7 @@ pub use self::copy::*;
 pub mod canada;
 
 use std::env;
+use std::time::Duration;
 
 pub fn num_trials() -> Option<usize> {
     let mut opts = getopts::Options::new();
@@ -53,8 +54,8 @@ pub fn num_trials() -> Option<usize> {
     matches.opt_str("n").map(|s| s.parse().unwrap())
 }
 
-pub fn throughput(dur: time::Duration, bytes: usize) -> u64 {
-    let mut megabytes_per_second = bytes as u64 / dur.whole_microseconds() as u64;
+pub fn throughput(dur: Duration, bytes: usize) -> u64 {
+    let mut megabytes_per_second = bytes as u64 / dur.as_micros() as u64;
 
     // Round to two significant digits.
     if megabytes_per_second > 100 {

src/timer.rs

@@ -1,6 +1,5 @@
 use std::cmp;
-
-use time::{Duration, Instant};
+use std::time::{Duration, Instant};
 
 pub fn bench<T, F>(trials: usize, f: F) -> Duration
 where