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

Merge pull request #1169 from lcnr/master

Browse Source 
fix spawn_local
This commit is contained in:
Alex Crichton 2019-01-14 12:38:29 -08:00 committed by GitHub
commit 666c1e4584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/futures/src/lib.rs
View File

@ -113,6 +113,7 @@ use std::sync::Arc;
use futures::executor::{self, Notify, Spawn};
use futures::prelude::*;
use futures::future;
use futures::sync::oneshot;
use js_sys::{Function, Promise};
use wasm_bindgen::prelude::*;
@ -393,6 +394,6 @@ where
future_to_promise(
future
.map(|()| JsValue::undefined())
.map_err(|()| JsValue::undefined()),
.or_else(|()| future::ok::<JsValue, JsValue>(JsValue::undefined())),
);
}

22
crates/futures/tests/tests.rs
View File

@ -86,3 +86,25 @@ fn spawn_local_runs() -> impl Future<Item = (), Error = JsValue> {
}
})
}
/// check that `spawn_local` does not forward the `future::err` as an unchecked rejection
#[wasm_bindgen_test(async)]
fn spawn_local_err_no_exception() -> impl Future<Item = (), Error = JsValue> {
let (tx, rx) = oneshot::channel::<u32>();
let fn_box = Box::new(move || {
tx.send(42).unwrap();
});
// Promises should run in a deterministic order, so the `err` should be handled during the execution of this test.
spawn_local(futures::future::err::<(), ()>(()));
spawn_local(futures::future::ok::<(), ()>(()).map(|_| {
fn_box();
}));
rx.then(|val| {
if val == Ok(42) {
Ok(())
} else {
Err(JsValue::undefined())
}
})
}