Promise-related bugfixes and an update to futures 0.2 (#206)

Cargo.toml

@@ -17,7 +17,9 @@ build = "build.rs"
 discard = "1.0.3"
 serde = { version = "1", optional = true }
 serde_json = { version = "1", optional = true }
-futures = { version = "0.1.18", optional = true }
+futures-core = { version = "0.2.0", optional = true }
+futures-channel = { version = "0.2.0", optional = true }
+futures-util = { version = "0.2.0", optional = true }
 
 stdweb-derive = { version = "0.4", path = "stdweb-derive" }
 
@@ -26,10 +28,11 @@ serde_json = "1"
 serde_derive = "1"
 
 [features]
-default = ["serde", "serde_json", "futures"]
+default = ["serde", "serde_json"]
 nightly = []
 web_test = []
-experimental_features_which_may_break_on_minor_version_bumps = []
+futures-support = ["futures-core", "futures-channel", "futures-util"]
+experimental_features_which_may_break_on_minor_version_bumps = ["futures-support"]
 "docs-rs" = []
 
 [target.wasm32-unknown-unknown.dependencies]

src/lib.rs

@@ -135,8 +135,14 @@ extern crate stdweb_internal_macros;
 #[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
 pub use stdweb_internal_macros::js_export;
 
-#[cfg(feature = "futures")]
-extern crate futures;
+#[cfg(feature = "futures-support")]
+extern crate futures_core;
+
+#[cfg(feature = "futures-support")]
+extern crate futures_util;
+
+#[cfg(feature = "futures-support")]
+extern crate futures_channel;
 
 #[macro_use]
 extern crate stdweb_derive;
@@ -181,7 +187,7 @@ pub use webcore::discard::DiscardOnDrop;
 pub use webcore::promise::{Promise, DoneHandle};
 
 #[cfg(all(
-    feature = "futures",
+    feature = "futures-support",
     feature = "experimental_features_which_may_break_on_minor_version_bumps"
 ))]
 pub use webcore::promise_future::PromiseFuture;