diff --git a/Cargo.toml b/Cargo.toml index 687c1db..8ef37c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "wasm-timer" edition = "2018" description = "Abstraction over std::time::Instant and futures-timer that works on WASM" -version = "0.2.1" +version = "0.2.2" authors = ["Pierre Krieger "] license = "MIT" repository = "https://github.com/tomaka/wasm-timer" @@ -12,7 +12,7 @@ futures-preview = "0.3.0-alpha" parking_lot = "0.9" pin-utils = "0.1.0-alpha.4" -[target.'cfg(any(target_arch = "wasm32"))'.dependencies] +[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] js-sys = "0.3.14" send_wrapper = "0.2" wasm-bindgen = { version = "0.2.37" } diff --git a/src/lib.rs b/src/lib.rs index b7e86f7..4c46791 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,11 +20,11 @@ pub use timer::*; -#[cfg(not(target_arch = "wasm32"))] +#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))] pub use std::time::{Instant, SystemTime, UNIX_EPOCH}; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", target_os = "unknown"))] pub use wasm::*; mod timer; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", target_os = "unknown"))] mod wasm; diff --git a/src/timer.rs b/src/timer.rs index 8bf567a..d0cec62 100644 --- a/src/timer.rs +++ b/src/timer.rs @@ -537,7 +537,7 @@ impl TimerHandle { } impl Default for TimerHandle { - #[cfg(not(target_arch = "wasm32"))] + #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))] fn default() -> TimerHandle { let mut fallback = HANDLE_FALLBACK.load(SeqCst); @@ -579,7 +579,7 @@ impl Default for TimerHandle { } } - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", target_os = "unknown"))] fn default() -> TimerHandle { let mut fallback = HANDLE_FALLBACK.load(SeqCst); diff --git a/src/timer/global.rs b/src/timer/global.rs index 6854148..6f70c5c 100644 --- a/src/timer/global.rs +++ b/src/timer/global.rs @@ -1,8 +1,8 @@ pub(crate) use self::platform::*; -#[cfg(not(target_arch = "wasm32"))] +#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))] #[path = "global/desktop.rs"] mod platform; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", target_os = "unknown"))] #[path = "global/wasm.rs"] mod platform; diff --git a/src/wasm.rs b/src/wasm.rs index b52cfb1..57ee1e6 100644 --- a/src/wasm.rs +++ b/src/wasm.rs @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", target_os = "unknown"))] use std::cmp::{Eq, PartialEq, Ord, PartialOrd, Ordering}; use std::ops::{Add, Sub, AddAssign, SubAssign};