From d3e59370e78ce279f45a3943457e22ebf46292fe Mon Sep 17 00:00:00 2001
From: Azriel Hoh <azriel91@gmail.com>
Date: Wed, 13 May 2020 10:14:05 +1200
Subject: [PATCH 1/3] Switches `wasm-timer` for `futures-timer`.

---
 Cargo.toml   | 4 ++--
 src/utils.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a14a32b3..5a1d31e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,7 +43,7 @@ std = [
   "pin-utils",
   "slab",
   "smol",
-  "wasm-timer",
+  "futures-timer",
   "wasm-bindgen-futures",
   "futures-channel",
 ]
@@ -74,7 +74,7 @@ surf = { version = "1.0.3", optional = true }
 smol = { version = "0.1.1", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-timer = { version = "0.2.4", optional = true }
+futures-timer = { version = "3.0.2", optional = true, features = ["wasm-bindgen"] }
 wasm-bindgen-futures = { version = "0.4.10", optional = true }
 futures-channel = { version = "0.3.4", optional = true }
 
diff --git a/src/utils.rs b/src/utils.rs
index ef068cb5..7c9aa996 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -64,12 +64,12 @@ pub(crate) type Timer = smol::Timer;
 
 #[cfg(all(target_arch = "wasm32", feature = "default"))]
 #[derive(Debug)]
-pub(crate) struct Timer(wasm_timer::Delay);
+pub(crate) struct Timer(futures_timer::Delay);
 
 #[cfg(all(target_arch = "wasm32", feature = "default"))]
 impl Timer {
     pub(crate) fn after(dur: std::time::Duration) -> Self {
-        Timer(wasm_timer::Delay::new(dur))
+        Timer(futures_timer::Delay::new(dur))
     }
 }
 

From e9621af345d854bcf1e71690b54cc270558c4940 Mon Sep 17 00:00:00 2001
From: Azriel Hoh <azriel91@gmail.com>
Date: Wed, 13 May 2020 10:37:19 +1200
Subject: [PATCH 2/3] Updates `CHANGELOG.md`.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7ac8b19..70d8ed89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview
 
 ## [Unreleased]
 
+## Changed
+
+- For `wasm`, switched underlying `Timer` implementation to [`futures-timer`](https://github.com/async-rs/futures-timer). ([#776](https://github.com/async-rs/async-std/pull/776))
+
 # [1.6.0-beta.1] - 2020-05-07
 
 ## Added

From baead51a282e077103a17b30fc6f25726613e0b6 Mon Sep 17 00:00:00 2001
From: Azriel Hoh <azriel91@gmail.com>
Date: Wed, 13 May 2020 10:38:40 +1200
Subject: [PATCH 3/3] Reduces duration in timeout test.

Tries to get CI to pass.
---
 tests/condvar.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/condvar.rs b/tests/condvar.rs
index 76574a16..b5ec12a1 100644
--- a/tests/condvar.rs
+++ b/tests/condvar.rs
@@ -29,7 +29,7 @@ fn wait_timeout_with_lock() {
 
         let (m, c) = &*pair;
         let (_, wait_result) = c
-            .wait_timeout(m.lock().await, Duration::from_millis(100))
+            .wait_timeout(m.lock().await, Duration::from_millis(50))
             .await;
         assert!(wait_result.timed_out());
     })