From 1347e8b7cd7f0d64492811c33da18697babf6f94 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 18 Apr 2019 17:23:39 +0200 Subject: [PATCH] Reexport Instant and fix license --- Cargo.toml | 2 +- LICENSE | 1 + src/lib.rs | 2 ++ src/wasm.rs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4925be8..0d6392c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "wasm-timer" edition = "2018" description = "Abstraction over std::time::Instant and tokio_timer that works on WASM" -version = "0.1.0" +version = "0.1.1" authors = ["Pierre Krieger "] license = "MIT" repository = "https://github.com/tomaka/wasm-timer" diff --git a/LICENSE b/LICENSE index 8fefffe..8acf927 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright 2019 Pierre Krieger +Copyright (c) 2019 Tokio Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/src/lib.rs b/src/lib.rs index 062ebc2..312f518 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,6 +18,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +#[cfg(not(target_arch = "wasm32"))] +pub use std::time::Instant; #[cfg(not(target_arch = "wasm32"))] pub use tokio_timer::*; #[cfg(target_arch = "wasm32")] diff --git a/src/wasm.rs b/src/wasm.rs index e1b1f14..7747454 100644 --- a/src/wasm.rs +++ b/src/wasm.rs @@ -1,4 +1,5 @@ // Copyright 2019 Pierre Krieger +// Copyright (c) 2019 Tokio Contributors // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"),