rustwasm/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/rustwasm/wasm-bindgen.git synced 2024-12-15 04:23:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1716 from najamelan/fix/futures-preview-0.3.0-alpha.18

Browse Source 
Update to work with futures-preview 0.3.0-alpha.18
This commit is contained in:
Alex Crichton 2019-08-12 09:12:07 -05:00 committed by GitHub
commit 3697fb7205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/futures/Cargo.toml
View File

@ -15,8 +15,8 @@ cfg-if = "0.1.9"
futures = "0.1.20" futures = "0.1.20"
js-sys = { path = "../js-sys", version = '0.3.25' } js-sys = { path = "../js-sys", version = '0.3.25' }
wasm-bindgen = { path = "../..", version = '0.2.48' } wasm-bindgen = { path = "../..", version = '0.2.48' }
futures-util-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.15", optional = true } futures-channel-preview = { version = "0.3.0-alpha.18", optional = true }
lazy_static = { version = "1.3.0", optional = true } lazy_static = { version = "1.3.0", optional = true }
[target.'cfg(target_feature = "atomics")'.dependencies.web-sys] [target.'cfg(target_feature = "atomics")'.dependencies.web-sys]

2
crates/futures/src/futures_0_3.rs
View File

@ -248,7 +248,7 @@ where
drop(lock); drop(lock);
// TODO is there some way of saving these so they don't need to be recreated all the time ? // 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); let cx = &mut Context::from_waker(&waker);
Pin::new(future).poll(cx) Pin::new(future).poll(cx)
}; };