From 2f3ceeccee311ee8dfbbbe3355a628c718974e15 Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Sat, 20 Aug 2016 20:05:40 +0200 Subject: [PATCH 1/2] Use std::time instead of deprecated crate time --- Cargo.toml | 1 - src/lib.rs | 2 -- src/macros.rs | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cdbd3947..b353ff97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,6 @@ heap_size = ["heapsize", "heapsize_plugin"] codegen = ["html5ever_macros"] [dependencies] -time = "0" log = "0" phf = "0.7" string_cache = "0.2.0" diff --git a/src/lib.rs b/src/lib.rs index 6a29e21a..f394953c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -29,8 +29,6 @@ extern crate mac; extern crate phf; -extern crate time; - pub use tokenizer::Attribute; pub use driver::{ParseOpts, parse_document, parse_fragment, Parser}; diff --git a/src/macros.rs b/src/macros.rs index 15eeff59..67c4be9f 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -24,9 +24,9 @@ macro_rules! unwrap_or_return { macro_rules! time { ($e:expr) => {{ - let t0 = ::time::precise_time_ns(); + let now = ::std::time::Instant::now(); let result = $e; - let dt = ::time::precise_time_ns() - t0; + let dt = now.elapsed().as_secs() as u64; (result, dt) }} } From c37706840cbad009ab70705c0bd02672ef0746c7 Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Sun, 21 Aug 2016 11:15:59 +0200 Subject: [PATCH 2/2] Use nanos duration on time macro Thanks-to: @SimonSapin --- src/macros.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/macros.rs b/src/macros.rs index 67c4be9f..82815191 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -26,7 +26,8 @@ macro_rules! time { ($e:expr) => {{ let now = ::std::time::Instant::now(); let result = $e; - let dt = now.elapsed().as_secs() as u64; + let d = now.elapsed(); + let dt = d.as_secs() * 1_000_000_000 + u64::from(d.subsec_nanos()); (result, dt) }} }