Migrate to futures 0.3

crates/console-timer/Cargo.toml

@@ -11,11 +11,11 @@ homepage = "https://github.com/rustwasm/gloo"
 categories = ["api-bindings", "development-tools::profiling", "wasm"]
 
 [dependencies.web-sys]
-version = "0.3.17"
+version = "0.3.31"
 features = [
     "console",
 ]
 
 [dev-dependencies]
-wasm-bindgen-test = "0.2.43"
+wasm-bindgen-test = "0.3.4"
 gloo-timers = { version = "0.1.0", path = "../timers" }

crates/events/Cargo.toml

@@ -11,23 +11,23 @@ homepage = "https://github.com/rustwasm/gloo"
 categories = ["api-bindings", "asynchronous", "web-programming", "wasm"]
 
 [dependencies]
-wasm-bindgen = "0.2.43"
+wasm-bindgen = "0.2.54"
 
 [dependencies.web-sys]
-version = "0.3.14"
+version = "0.3.31"
 features = [
     "Event",
     "EventTarget",
     "AddEventListenerOptions",
 ]
 
 [dev-dependencies]
-js-sys = "0.3.14"
-futures = "0.1.25"
-wasm-bindgen-test = "0.2.43"
+js-sys = "0.3.31"
+futures = "0.3"
+wasm-bindgen-test = "0.3.4"
 
 [dev-dependencies.web-sys]
-version = "0.3.14"
+version = "0.3.31"
 features = [
     "HtmlElement",
     "Window",

crates/events/src/lib.rs

@@ -189,9 +189,10 @@ thread_local! {
 /// ```rust
 /// # use gloo_events::EventListener;
 /// # use wasm_bindgen::UnwrapThrowExt;
-/// use futures::Poll;
+/// use std::pin::Pin;
+/// use std::task::{Context, Poll};
 /// use futures::stream::Stream;
-/// use futures::sync::mpsc;
+/// use futures::channel::mpsc;
 /// use web_sys::EventTarget;
 ///
 /// pub struct OnClick {
@@ -214,14 +215,17 @@ thread_local! {
 ///             listener,
 ///         }
 ///     }
+///
+///     fn project_receiver(self: Pin<&mut Self>) -> Pin<&mut mpsc::UnboundedReceiver<()>> {
+///         unsafe { self.map_unchecked_mut(|s| &mut s.receiver) } 
+///     }
 /// }
 ///
 /// impl Stream for OnClick {
 ///     type Item = ();
-///     type Error = ();
 ///
-///     fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
-///         self.receiver.poll().map_err(|_| unreachable!())
+///     fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+///         self.project_receiver().poll_next(cx)
 ///     }
 /// }
 /// ```

crates/events/tests/web.rs

@@ -3,7 +3,6 @@
 #![cfg(target_arch = "wasm32")]
 
 use futures::prelude::*;
-use futures::sync::mpsc;
 use gloo_events::{EventListener, EventListenerOptions, EventListenerPhase};
 use js_sys::Error;
 use wasm_bindgen::{JsCast, JsValue, UnwrapThrowExt};
@@ -38,7 +37,7 @@ where
 
 #[derive(Clone)]
 struct Sender<A> {
-    sender: mpsc::UnboundedSender<Result<A, JsValue>>,
+    sender: futures::channel::mpsc::UnboundedSender<Result<A, JsValue>>,
 }
 
 impl<A> Sender<A> {
@@ -50,29 +49,29 @@ impl<A> Sender<A> {
     }
 }
 
-fn mpsc<A, F>(f: F) -> impl Future<Item = Vec<A>, Error = JsValue>
+async fn mpsc<A, F>(f: F) -> Vec<A>
 where
     F: FnOnce(Sender<A>),
 {
-    let (sender, receiver) = futures::sync::mpsc::unbounded();
+    let (sender, receiver) = futures::channel::mpsc::unbounded();
 
     f(Sender { sender });
 
     receiver
-        .then(|x| match x {
+        .map(|x| match x {
             Ok(a) => a,
             Err(_) => unreachable!(),
         })
-        .collect()
+        .collect().await
 }
 
 // ----------------------------------------------------------------------------
 // Tests begin here
 // ----------------------------------------------------------------------------
 
-#[wasm_bindgen_test(async)]
-fn new_with_options() -> impl Future<Item = (), Error = JsValue> {
-    mpsc(|sender| {
+#[wasm_bindgen_test]
+async fn new_with_options() {
+    let results = mpsc::<(), _>(|sender| {
         let body = body();
 
         let _handler = EventListener::new_with_options(
@@ -93,13 +92,13 @@ fn new_with_options() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![(), ()]))
+    }).await;
+    is(results, vec![(), ()]).unwrap_throw();
 }
 
-#[wasm_bindgen_test(async)]
-fn once_with_options() -> impl Future<Item = (), Error = JsValue> {
-    mpsc(|sender| {
+#[wasm_bindgen_test]
+async fn once_with_options() {
+    let results = mpsc::<(), _>(|sender| {
         let body = body();
 
         let _handler = EventListener::once_with_options(
@@ -120,13 +119,13 @@ fn once_with_options() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![()]))
+    }).await;
+    is(results, vec![()]).unwrap_throw();
 }
 
-#[wasm_bindgen_test(async)]
-fn new() -> impl Future<Item = (), Error = JsValue> {
-    mpsc(|sender| {
+#[wasm_bindgen_test]
+async fn new() {
+    let results = mpsc::<(), _>(|sender| {
         let body = body();
 
         let _handler = EventListener::new(&body, "click", move |e| {
@@ -139,13 +138,13 @@ fn new() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![(), ()]))
+    }).await;
+    is(results, vec![(), ()]).unwrap_throw();
 }
 
-#[wasm_bindgen_test(async)]
-fn once() -> impl Future<Item = (), Error = JsValue> {
-    mpsc(|sender| {
+#[wasm_bindgen_test]
+async fn once() {
+    let results = mpsc::<(), _>(|sender| {
         let body = body();
 
         let _handler = EventListener::once(&body, "click", move |e| {
@@ -158,8 +157,8 @@ fn once() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![()]))
+    }).await;
+    is(results, vec![()]).unwrap_throw();
 }
 
 // TODO is it possible to somehow cleanup the closure after a timeout?
@@ -177,9 +176,9 @@ fn forget() {
     handler.forget();
 }
 
-#[wasm_bindgen_test(async)]
-fn dynamic_registration() -> impl Future<Item = (), Error = JsValue> {
-    mpsc(|sender| {
+#[wasm_bindgen_test]
+async fn dynamic_registration() {
+    let results = mpsc::<usize, _>(|sender| {
         let body = body();
 
         let handler1 = EventListener::new(&body, "click", {
@@ -212,6 +211,6 @@ fn dynamic_registration() -> impl Future<Item = (), Error = JsValue> {
         drop(handler3);
 
         body.click();
-    })
-    .and_then(|results| is(results, vec![1, 2, 2, 2, 3, 3]))
+    }).await;
+    is(results, vec![1, 2, 2, 2, 3, 3]).unwrap_throw();
 }

crates/timers/Cargo.toml

@@ -11,16 +11,16 @@ homepage = "https://github.com/rustwasm/gloo"
 categories = ["api-bindings", "asynchronous", "wasm"]
 
 [dependencies]
-wasm-bindgen = "0.2.43"
-js-sys = "0.3.17"
+wasm-bindgen = "0.2.54"
+js-sys = "0.3.31"
 
 [dependencies.futures_rs]
 package = "futures"
-version = "0.1.25"
+version = "0.3"
 optional = true
 
 [dependencies.wasm-bindgen-futures]
-version = "0.3.19"
+version = "0.4.4"
 optional = true
 
 [dependencies.web-sys]
@@ -35,4 +35,4 @@ futures = ["futures_rs", "wasm-bindgen-futures"]
 
 
 [dev-dependencies]
-wasm-bindgen-test = "0.2.43"
+wasm-bindgen-test = "0.3.4"