Merge pull request #1716 from najamelan/fix/futures-preview-0.3.0-alp…

…ha.18 Update to work with futures-preview 0.3.0-alpha.18
rustwasm · Aug 12, 2019 · 3697fb7 · 3697fb7
2 parents bb6c013 + 9f7afa8
commit 3697fb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crates/futures/Cargo.toml b/crates/futures/Cargo.toml
@@ -15,8 +15,8 @@ cfg-if = "0.1.9"
 futures = "0.1.20"
 js-sys = { path = "../js-sys", version = '0.3.25' }
 wasm-bindgen = { path = "../..", version = '0.2.48' }
-futures-util-preview = { version = "0.3.0-alpha.15", optional = true }
-futures-channel-preview = { version = "0.3.0-alpha.15", optional = true }
+futures-util-preview = { version = "0.3.0-alpha.18", optional = true }
+futures-channel-preview = { version = "0.3.0-alpha.18", optional = true }
 lazy_static = { version = "1.3.0", optional = true }
 
 [target.'cfg(target_feature = "atomics")'.dependencies.web-sys]

diff --git a/crates/futures/src/futures_0_3.rs b/crates/futures/src/futures_0_3.rs
@@ -248,7 +248,7 @@ where
                                     drop(lock);
 
                                     // TODO is there some way of saving these so they don't need to be recreated all the time ?
-                                    let waker = ArcWake::into_waker(task.clone());
+                                    let waker = futures_util::task::waker(task.clone());
                                     let cx = &mut Context::from_waker(&waker);
                                     Pin::new(future).poll(cx)
                                 };