From 99c3a61a763dd7f785226164ffe5777ece0188be Mon Sep 17 00:00:00 2001 From: Toralf Wittner Date: Tue, 19 Nov 2019 12:14:10 +0100 Subject: [PATCH] Update to futures-0.3 --- Cargo.toml | 13 ++++++++----- src/timer/ext.rs | 16 ++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8ef37c6..7a08d9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,13 +8,16 @@ license = "MIT" repository = "https://github.com/tomaka/wasm-timer" [dependencies] -futures-preview = "0.3.0-alpha" +futures = "0.3.1" parking_lot = "0.9" pin-utils = "0.1.0-alpha.4" [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] -js-sys = "0.3.14" +js-sys = "0.3.31" send_wrapper = "0.2" -wasm-bindgen = { version = "0.2.37" } -wasm-bindgen-futures = { version = "0.3.25", features = ["futures_0_3"] } -web-sys = { version = "0.3.14", features = ["Performance", "Window"] } +wasm-bindgen = "0.2.37" +wasm-bindgen-futures = "0.4.4" +web-sys = { version = "0.3.31", features = ["Performance", "Window"] } + +[dev-dependencies] +async-std = "1.0" diff --git a/src/timer/ext.rs b/src/timer/ext.rs index 1b14950..060ae83 100644 --- a/src/timer/ext.rs +++ b/src/timer/ext.rs @@ -27,24 +27,24 @@ pub trait TryFutureExt: TryFuture + Sized { /// # Examples /// /// ```no_run - /// # #![feature(async_await)] /// use std::time::Duration; /// use futures::prelude::*; - /// use futures_timer::TryFutureExt; + /// use wasm_timer::TryFutureExt; /// /// # fn long_future() -> impl TryFuture { /// # futures::future::ok(()) /// # } /// # - /// #[runtime::main] - /// async fn main() { + /// fn main() { /// let future = long_future(); /// let timed_out = future.timeout(Duration::from_secs(1)); /// - /// match timed_out.await { - /// Ok(item) => println!("got {:?} within enough time!", item), - /// Err(_) => println!("took too long to produce the item"), - /// } + /// async_std::task::block_on(async { + /// match timed_out.await { + /// Ok(item) => println!("got {:?} within enough time!", item), + /// Err(_) => println!("took too long to produce the item"), + /// } + /// }) /// } /// ``` fn timeout(self, dur: Duration) -> Timeout