Merge remote-tracking branch 'upstream/master' into systemtime

sebcrozet · Sep 30, 2021 · c59ec90 · c59ec90
2 parents 858c708 + c7d8e52
commit c59ec90
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "instant"
-version = "0.1.10"
+version = "0.1.11"
 authors = ["sebcrozet <[email protected]>"]
 description = "A partial replacement for std::time::Instant that works on WASM too."
 repository = "https://github.com/sebcrozet/instant"

diff --git a/src/lib.rs b/src/lib.rs
@@ -23,14 +23,12 @@ cfg_if::cfg_if! {
     not(any(target_arch = "wasm32", target_arch = "asmjs")),
     not(any(feature = "stdweb", feature = "wasm-bindgen"))
 ))]
-#[cfg(feature = "now")]
 pub use crate::native::SystemTime;
 
 #[cfg(all(
     any(target_arch = "wasm32", target_arch = "asmjs"),
     any(feature = "stdweb", feature = "wasm-bindgen")
 ))]
-#[cfg(feature = "now")]
 pub use crate::wasm::SystemTime;
 
 pub use std::time::Duration;