Merge pull request #98 from derekdreery/future_0_3

Migrate to futures 0.3

Author: Pauan

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/README.md

@@ -20,6 +20,9 @@
   <sub>Built with 🦀🕸 by <a href="https://rustwasm.github.io/">The Rust and WebAssembly Working Group</a></sub>
 </div>
 
-Using event listeners with [`web-sys`](https://crates.io/crates/web-sys) is hard! This crate provides an [`EventListener`](https://docs.rs/gloo-events/0.1.0/gloo_events/struct.EventListener.html) type which makes it easy!
+Using event listeners with [`web-sys`](https://crates.io/crates/web-sys) is hard! This crate
+provides an [`EventListener`] type which makes it easy!
 
-See the documentation for [`EventListener`](https://docs.rs/gloo-events/0.1.0/gloo_events/struct.EventListener.html) for more information.
+See the documentation for [`EventListener`] for more information.
+
+[`EventListener`]: struct.EventListener.html

crates/events/src/lib.rs

@@ -1,7 +1,10 @@
 /*!
-Using event listeners with [`web-sys`](https://crates.io/crates/web-sys) is hard! This crate provides an [`EventListener`](struct.EventListener.html) type which makes it easy!
+Using event listeners with [`web-sys`](https://crates.io/crates/web-sys) is hard! This crate
+provides an [`EventListener`] type which makes it easy!
 
-See the documentation for [`EventListener`](struct.EventListener.html) for more information.
+See the documentation for [`EventListener`] for more information.
+
+[`EventListener`]: struct.EventListener.html
 */
 #![deny(missing_docs, missing_debug_implementations)]
 
@@ -182,16 +185,18 @@ thread_local! {
 
 /// RAII type which is used to manage DOM event listeners.
 ///
-/// When the `EventListener` is dropped, it will automatically deregister the event listener and clean up the closure's memory.
+/// When the `EventListener` is dropped, it will automatically deregister the event listener and
+/// clean up the closure's memory.
 ///
 /// Normally the `EventListener` is stored inside of another struct, like this:
 ///
 /// ```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 {
@@ -218,10 +223,9 @@ thread_local! {
 ///
 /// 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(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
+///         Pin::new(&mut self.receiver).poll_next(cx)
 ///     }
 /// }
 /// ```

crates/events/tests/web.rs

@@ -3,7 +3,7 @@
 #![cfg(target_arch = "wasm32")]
 
 use futures::prelude::*;
-use futures::sync::mpsc;
+use futures::channel::mpsc;
 use gloo_events::{EventListener, EventListenerOptions, EventListenerPhase};
 use js_sys::Error;
 use wasm_bindgen::{JsCast, JsValue, UnwrapThrowExt};
@@ -50,29 +50,22 @@ impl<A> Sender<A> {
     }
 }
 
-fn mpsc<A, F>(f: F) -> impl Future<Item = Vec<A>, Error = JsValue>
+async fn mpsc<A, F>(f: F) -> Result<Vec<A>, JsValue>
 where
     F: FnOnce(Sender<A>),
 {
-    let (sender, receiver) = futures::sync::mpsc::unbounded();
-
+    let (sender, receiver) = mpsc::unbounded();
     f(Sender { sender });
-
-    receiver
-        .then(|x| match x {
-            Ok(a) => a,
-            Err(_) => unreachable!(),
-        })
-        .collect()
+    receiver.try_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 +86,13 @@ fn new_with_options() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![(), ()]))
+    }).await;
+    assert_eq!(results, Ok(vec![(), ()]));
 }
 
-#[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 +113,13 @@ fn once_with_options() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![()]))
+    }).await;
+    assert_eq!(results, Ok(vec![()]));
 }
 
-#[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 +132,13 @@ fn new() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![(), ()]))
+    }).await;
+    assert_eq!(results, Ok(vec![(), ()]));
 }
 
-#[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 +151,8 @@ fn once() -> impl Future<Item = (), Error = JsValue> {
 
         body.click();
         body.click();
-    })
-    .and_then(|results| is(results, vec![()]))
+    }).await;
+    assert_eq!(results, Ok(vec![()]));
 }
 
 // TODO is it possible to somehow cleanup the closure after a timeout?
@@ -177,9 +170,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(|sender| {
         let body = body();
 
         let handler1 = EventListener::new(&body, "click", {
@@ -212,6 +205,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;
+    assert_eq!(results, Ok(vec![1, 2, 2, 2, 3, 3]));
 }

crates/timers/Cargo.toml

@@ -11,17 +11,10 @@ homepage = "https://github.com/rustwasm/gloo"
 categories = ["api-bindings", "asynchronous", "wasm"]
 
 [dependencies]
-wasm-bindgen = "0.2.43"
-js-sys = "0.3.17"
-
-[dependencies.futures_rs]
-package = "futures"
-version = "0.1.25"
-optional = true
-
-[dependencies.wasm-bindgen-futures]
-version = "0.3.19"
-optional = true
+wasm-bindgen = "0.2.54"
+js-sys = "0.3.31"
+futures-core = { version = "0.3", optional = true }
+futures-channel = { version = "0.3", optional = true }
 
 [dependencies.web-sys]
 version = "0.3.19"
@@ -31,8 +24,10 @@ features = [
 
 [features]
 default = []
-futures = ["futures_rs", "wasm-bindgen-futures"]
+futures = ["futures-core", "futures-channel"]
 
 
 [dev-dependencies]
-wasm-bindgen-test = "0.2.43"
+wasm-bindgen-futures = "0.4.4"
+wasm-bindgen-test = "0.3.4"
+futures-util = "0.3"