From 9f7afa8a5e03f65b3435fe5394558b3fcf9e8927 Mon Sep 17 00:00:00 2001 From: Naja Melan Date: Sat, 10 Aug 2019 21:33:36 +0200 Subject: [PATCH] Update to work with futures-preview 0.3.0-alpha.18 --- crates/futures/Cargo.toml | 4 ++-- crates/futures/src/futures_0_3.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/futures/Cargo.toml b/crates/futures/Cargo.toml index b07b78f17..df8afc88d 100644 --- 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 index 508eb9f1d..79fe46cd6 100644 --- 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) };