Merge branch 'master' into fix-stream-forward-impl

Author: ebkalderon

.gitignore

@@ -3,3 +3,5 @@ target/
 Cargo.lock
 _site
 .sass-cache
+.idea
+.DS_Store

.travis.yml

@@ -25,7 +25,7 @@ matrix:
 
     # When updating this, the reminder to update the minimum required version in README.md.
     - name: cargo test (minimum required version)
-      rust: nightly-2019-01-11
+      rust: nightly-2019-02-15
 
     - name: cargo clippy
       rust: nightly
@@ -64,17 +64,26 @@ matrix:
       script:
         - cargo build --manifest-path futures/Cargo.toml --features io-compat
 
-    # Allow build fail until #1396 is fixed.
     - name: cargo build --target=thumbv6m-none-eabi
       rust: nightly
-      env: ALLOW_FAILURES=true
       install:
         - rustup target add thumbv6m-none-eabi
       script:
+        - cargo run --manifest-path ci/remove-dev-dependencies/Cargo.toml */Cargo.toml
         - cargo build --manifest-path futures/Cargo.toml
             --target thumbv6m-none-eabi
             --no-default-features
-            --features nightly
+            --features nightly,cfg-target-has-atomic
+
+    - name: cargo build --target=thumbv7m-none-eabi
+      rust: nightly
+      install:
+        - rustup target add thumbv7m-none-eabi
+      script:
+        - cargo run --manifest-path ci/remove-dev-dependencies/Cargo.toml */Cargo.toml
+        - cargo build --manifest-path futures/Cargo.toml
+            --target thumbv7m-none-eabi
+            --no-default-features
 
     - name: cargo doc
       rust: nightly
@@ -102,10 +111,6 @@ matrix:
         - git commit -m "Add API docs for $TRAVIS_TAG"
         - git push origin master
 
-  allow_failures:
-    - rust: nightly
-      env: ALLOW_FAILURES=true
-
 script:
   - cargo test --all --all-features
   - cargo test --all --all-features --release

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.3.0-alpha.13 - 2019-2-20
+* Updated to new nightly with stabilization candidate API.
+* Removed `LocalWaker`.
+* Added `#[must_use]` to `Stream` and `Sink` traits.
+* Enabled using `!Unpin` futures in `JoinAll`.
+* Added the `try_join_all` combinator.
+* Stopped closing a whole channel upon closing of one sender.
+* Removed `TokioDefaultSpawner` and `tokio-compat`.
+* Moved intra-crate dependencies to exact versions.
+
 # 0.3.0-alpha.12 - 2019-1-14
 * Updated to new nightly with a modification to `Pin::set`.
 * Expose `AssertUnmoved` and `PendingOnce`.

README.md

@@ -17,7 +17,7 @@
 </p>
 
 <p align="center">
-  <a href="https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.12/futures/">
+  <a href="https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.13/futures/">
     Documentation
   </a> | <a href="https://rust-lang-nursery.github.io/futures-rs/">
     Website
@@ -30,7 +30,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-futures-preview = "0.3.0-alpha.12"
+futures-preview = "0.3.0-alpha.13"
 ```
 
 Now, you can use futures-rs:
@@ -39,7 +39,7 @@ Now, you can use futures-rs:
 use futures::future::Future; // Note: It's not `futures_preview`
 ```
 
-The current version of futures-rs requires Rust nightly 2019-01-11 or later.
+The current version of futures-rs requires Rust nightly 2019-02-15 or later.
 
 ### Feature `std`
 
@@ -49,7 +49,7 @@ a `#[no_std]` environment, use:
 
 ```toml
 [dependencies]
-futures-preview = { version = "=0.3.0-alpha.12", default-features = false }
+futures-preview = { version = "=0.3.0-alpha.13", default-features = false }
 ```
 
 # License

ci/remove-dev-dependencies/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "remove-dev-dependencies"
+version = "0.1.0"
+authors = ["Wim Looman <[email protected]>"]
+edition = "2018"
+publish = false
+
+[workspace]
+
+[dependencies]
+toml_edit = "0.1.3"

ci/remove-dev-dependencies/src/main.rs

@@ -0,0 +1,12 @@
+use std::{env, error::Error, fs};
+
+fn main() -> Result<(), Box<dyn Error>> {
+    for file in env::args().skip(1) {
+        let content = fs::read_to_string(&file)?;
+        let mut doc: toml_edit::Document = content.parse()?;
+        doc.as_table_mut().remove("dev-dependencies");
+        fs::write(file, doc.to_string())?;
+    }
+
+    Ok(())
+}

futures-channel/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "futures-channel-preview"
 edition = "2018"
-version = "0.3.0-alpha.12"
+version = "0.3.0-alpha.13"
 authors = ["Alex Crichton <[email protected]>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/futures-rs"
 homepage = "https://rust-lang-nursery.github.io/futures-rs"
-documentation = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.12/futures_channel"
+documentation = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.13/futures_channel"
 description = """
 Channels for asynchronous communication using futures-rs.
 """
@@ -19,9 +19,9 @@ std = ["futures-core-preview/std"]
 default = ["std"]
 
 [dependencies]
-futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.12", default-features = false }
+futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.13", default-features = false }
 
 [dev-dependencies]
-futures-preview = { path = "../futures", version = "=0.3.0-alpha.12", default-features = true }
-futures-test-preview = { path = "../futures-test", version = "=0.3.0-alpha.12", default-features = true }
+futures-preview = { path = "../futures", version = "=0.3.0-alpha.13", default-features = true }
+futures-test-preview = { path = "../futures-test", version = "=0.3.0-alpha.13", default-features = true }
 pin-utils = "0.1.0-alpha.4"

futures-channel/benches/sync_mpsc.rs

@@ -9,16 +9,16 @@ use {
         ready,
         stream::{Stream, StreamExt},
         sink::Sink,
-        task::{LocalWaker, Poll},
+        task::{Waker, Poll},
     },
-    futures_test::task::noop_local_waker_ref,
+    futures_test::task::noop_waker_ref,
     std::pin::Pin,
 };
 
 /// Single producer, single consumer
 #[bench]
 fn unbounded_1_tx(b: &mut Bencher) {
-    let lw = noop_local_waker_ref();
+    let waker = noop_waker_ref();
     b.iter(|| {
         let (tx, mut rx) = mpsc::unbounded();
 
@@ -27,20 +27,20 @@ fn unbounded_1_tx(b: &mut Bencher) {
         for i in 0..1000 {
 
             // Poll, not ready, park
-            assert_eq!(Poll::Pending, rx.poll_next_unpin(lw));
+            assert_eq!(Poll::Pending, rx.poll_next_unpin(waker));
 
             UnboundedSender::unbounded_send(&tx, i).unwrap();
 
             // Now poll ready
-            assert_eq!(Poll::Ready(Some(i)), rx.poll_next_unpin(lw));
+            assert_eq!(Poll::Ready(Some(i)), rx.poll_next_unpin(waker));
         }
     })
 }
 
 /// 100 producers, single consumer
 #[bench]
 fn unbounded_100_tx(b: &mut Bencher) {
-    let lw = noop_local_waker_ref();
+    let waker = noop_waker_ref();
     b.iter(|| {
         let (tx, mut rx) = mpsc::unbounded();
 
@@ -49,26 +49,26 @@ fn unbounded_100_tx(b: &mut Bencher) {
         // 1000 send/recv operations total, result should be divided by 1000
         for _ in 0..10 {
             for i in 0..tx.len() {
-                assert_eq!(Poll::Pending, rx.poll_next_unpin(lw));
+                assert_eq!(Poll::Pending, rx.poll_next_unpin(waker));
 
                 UnboundedSender::unbounded_send(&tx[i], i).unwrap();
 
-                assert_eq!(Poll::Ready(Some(i)), rx.poll_next_unpin(lw));
+                assert_eq!(Poll::Ready(Some(i)), rx.poll_next_unpin(waker));
             }
         }
     })
 }
 
 #[bench]
 fn unbounded_uncontended(b: &mut Bencher) {
-    let lw = noop_local_waker_ref();
+    let waker = noop_waker_ref();
     b.iter(|| {
         let (tx, mut rx) = mpsc::unbounded();
 
         for i in 0..1000 {
             UnboundedSender::unbounded_send(&tx, i).expect("send");
             // No need to create a task, because poll is not going to park.
-            assert_eq!(Poll::Ready(Some(i)), rx.poll_next_unpin(lw));
+            assert_eq!(Poll::Ready(Some(i)), rx.poll_next_unpin(waker));
         }
     })
 }
@@ -84,41 +84,41 @@ struct TestSender {
 impl Stream for TestSender {
     type Item = u32;
 
-    fn poll_next(mut self: Pin<&mut Self>, lw: &LocalWaker)
+    fn poll_next(mut self: Pin<&mut Self>, waker: &Waker)
         -> Poll<Option<Self::Item>>
     {
         let this = &mut *self;
         let mut tx = Pin::new(&mut this.tx);
 
-        ready!(tx.as_mut().poll_ready(lw)).unwrap();
+        ready!(tx.as_mut().poll_ready(waker)).unwrap();
         tx.as_mut().start_send(this.last + 1).unwrap();
         this.last += 1;
-        assert_eq!(Poll::Ready(Ok(())), tx.as_mut().poll_flush(lw));
+        assert_eq!(Poll::Ready(Ok(())), tx.as_mut().poll_flush(waker));
         Poll::Ready(Some(this.last))
     }
 }
 
 /// Single producers, single consumer
 #[bench]
 fn bounded_1_tx(b: &mut Bencher) {
-    let lw = noop_local_waker_ref();
+    let waker = noop_waker_ref();
     b.iter(|| {
         let (tx, mut rx) = mpsc::channel(0);
 
         let mut tx = TestSender { tx, last: 0 };
 
         for i in 0..1000 {
-            assert_eq!(Poll::Ready(Some(i + 1)), tx.poll_next_unpin(lw));
-            assert_eq!(Poll::Pending, tx.poll_next_unpin(lw));
-            assert_eq!(Poll::Ready(Some(i + 1)), rx.poll_next_unpin(lw));
+            assert_eq!(Poll::Ready(Some(i + 1)), tx.poll_next_unpin(waker));
+            assert_eq!(Poll::Pending, tx.poll_next_unpin(waker));
+            assert_eq!(Poll::Ready(Some(i + 1)), rx.poll_next_unpin(waker));
         }
     })
 }
 
 /// 100 producers, single consumer
 #[bench]
 fn bounded_100_tx(b: &mut Bencher) {
-    let lw = noop_local_waker_ref();
+    let waker = noop_waker_ref();
     b.iter(|| {
         // Each sender can send one item after specified capacity
         let (tx, mut rx) = mpsc::channel(0);
@@ -133,11 +133,11 @@ fn bounded_100_tx(b: &mut Bencher) {
         for i in 0..10 {
             for j in 0..tx.len() {
                 // Send an item
-                assert_eq!(Poll::Ready(Some(i + 1)), tx[j].poll_next_unpin(lw));
+                assert_eq!(Poll::Ready(Some(i + 1)), tx[j].poll_next_unpin(waker));
                 // Then block
-                assert_eq!(Poll::Pending, tx[j].poll_next_unpin(lw));
+                assert_eq!(Poll::Pending, tx[j].poll_next_unpin(waker));
                 // Recv the item
-                assert_eq!(Poll::Ready(Some(i + 1)), rx.poll_next_unpin(lw));
+                assert_eq!(Poll::Ready(Some(i + 1)), rx.poll_next_unpin(waker));
             }
         }
     })

futures-channel/src/lib.rs

@@ -9,7 +9,7 @@
 
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 
-#![doc(html_root_url = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.12/futures_channel")]
+#![doc(html_root_url = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.13/futures_channel")]
 
 #[cfg(feature = "std")]
 mod lock;