Update to stabilized futures_api

rust-lang · Apr 25, 2019 · bbbfbb7 · bbbfbb7
1 parent 5f866c4
commit bbbfbb7
Show file tree

Hide file tree

Showing 76 changed files with 112 additions and 176 deletions.
diff --git a/.travis.yml b/.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-04-15
+      rust: nightly-2019-04-25
 
     - name: cargo clippy
       rust: nightly

diff --git a/README.md b/README.md
@@ -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-04-15 or later.
+The current version of futures-rs requires Rust nightly 2019-04-25 or later.
 
 ### Feature `std`
 

diff --git a/futures-channel/benches/sync_mpsc.rs b/futures-channel/benches/sync_mpsc.rs
@@ -1,4 +1,4 @@
-#![feature(test, futures_api)]
+#![feature(test)]
 
 extern crate test;
 use crate::test::Bencher;

diff --git a/futures-channel/src/lib.rs b/futures-channel/src/lib.rs
@@ -3,8 +3,6 @@
 //! This crate provides channels that can be used to communicate between
 //! asynchronous tasks.
 
-#![feature(futures_api)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]

diff --git a/futures-channel/tests/channel.rs b/futures-channel/tests/channel.rs
@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro, futures_api)]
+#![feature(async_await, await_macro)]
 
 use futures::channel::mpsc;
 use futures::executor::block_on;

diff --git a/futures-channel/tests/mpsc.rs b/futures-channel/tests/mpsc.rs
@@ -1,4 +1,4 @@
-#![feature(futures_api, async_await, await_macro)]
+#![feature(async_await, await_macro)]
 
 use futures::channel::{mpsc, oneshot};
 use futures::executor::{block_on, block_on_stream};

diff --git a/futures-channel/tests/oneshot.rs b/futures-channel/tests/oneshot.rs
@@ -1,5 +1,3 @@
-#![feature(futures_api)]
-
 use futures::channel::oneshot::{self, Sender};
 use futures::executor::block_on;
 use futures::future::{Future, FutureExt, poll_fn};

diff --git a/futures-core/src/lib.rs b/futures-core/src/lib.rs
@@ -1,6 +1,5 @@
 //! Core traits and types for asynchronous operations in Rust.
 
-#![feature(futures_api)]
 #![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
 
 #![cfg_attr(not(feature = "std"), no_std)]

diff --git a/futures-core/src/task/__internal/atomic_waker.rs b/futures-core/src/task/__internal/atomic_waker.rs
@@ -169,7 +169,6 @@ impl AtomicWaker {
     /// Here is how `register` is used when implementing a flag.
     ///
     /// ```
-    /// #![feature(futures_api)]
     /// use futures::future::Future;
     /// use futures::task::{Context, Poll, AtomicWaker};
     /// use std::sync::atomic::AtomicBool;

diff --git a/futures-executor/benches/thread_notify.rs b/futures-executor/benches/thread_notify.rs
@@ -1,4 +1,4 @@
-#![feature(test, futures_api)]
+#![feature(test)]
 
 extern crate test;
 use crate::test::Bencher;

diff --git a/futures-executor/src/lib.rs b/futures-executor/src/lib.rs
@@ -1,7 +1,5 @@
 //! Built-in executors and related tools.
 
-#![feature(futures_api)]
-
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]

diff --git a/futures-executor/src/local_pool.rs b/futures-executor/src/local_pool.rs
@@ -132,7 +132,6 @@ impl LocalPool {
     /// the `LocalPool` by using its spawner handle:
     ///
     /// ```
-    /// #![feature(futures_api)]
     /// use futures::executor::LocalPool;
     /// use futures::future::ready;
     ///
@@ -170,7 +169,6 @@ impl LocalPool {
     /// can be made. Returns `true` if one future was completed, `false` otherwise.
     ///
     /// ```
-    /// #![feature(futures_api)]
     /// use futures::executor::LocalPool;
     /// use futures::task::LocalSpawnExt;
     /// use futures::future::{ready, empty};
@@ -211,7 +209,6 @@ impl LocalPool {
     /// on any task.
     ///
     /// ```
-    /// #![feature(futures_api)]
     /// use futures::executor::LocalPool;
     /// use futures::task::LocalSpawnExt;
     /// use futures::future::{ready, empty};

diff --git a/futures-executor/tests/local_pool.rs b/futures-executor/tests/local_pool.rs
@@ -1,5 +1,3 @@
-#![feature(futures_api)]
-
 use futures::channel::oneshot;
 use futures::executor::LocalPool;
 use futures::future::{Future, lazy, poll_fn};

diff --git a/futures-io/src/lib.rs b/futures-io/src/lib.rs
@@ -10,8 +10,6 @@
 
 #![doc(html_root_url = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.14/futures_io")]
 
-#![feature(futures_api)]
-
 #[cfg(feature = "std")]
 mod if_std {
     use futures_core::task::{Context, Poll};

diff --git a/futures-io/tests/cursor.rs b/futures-io/tests/cursor.rs
@@ -1,5 +1,3 @@
-#![feature(futures_api)]
-
 use assert_matches::assert_matches;
 use futures::Poll;
 use futures::future::lazy;

diff --git a/futures-sink/src/lib.rs b/futures-sink/src/lib.rs
@@ -7,8 +7,6 @@
 #![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.14/futures_sink")]
 
-#![feature(futures_api)]
-
 #[cfg(feature = "alloc")]
 extern crate alloc;
 

diff --git a/futures-test/src/assert.rs b/futures-test/src/assert.rs
@@ -9,7 +9,7 @@ pub fn assert_is_unpin_stream<S: Stream + Unpin>(_: &mut S) {}
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::stream;
 /// use futures_test::future::FutureTestExt;
 /// use futures_test::{
@@ -46,7 +46,7 @@ macro_rules! assert_stream_pending {
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::stream;
 /// use futures_test::future::FutureTestExt;
 /// use futures_test::{
@@ -89,7 +89,7 @@ macro_rules! assert_stream_next {
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::stream;
 /// use futures_test::future::FutureTestExt;
 /// use futures_test::{

diff --git a/futures-test/src/future/mod.rs b/futures-test/src/future/mod.rs
@@ -33,7 +33,7 @@ pub trait FutureTestExt: Future {
     /// # Examples
     ///
     /// ```
-    /// #![feature(async_await, futures_api)]
+    /// #![feature(async_await)]
     /// use futures::task::Poll;
     /// use futures::future::FutureExt;
     /// use futures_test::task::noop_context;
@@ -60,7 +60,7 @@ pub trait FutureTestExt: Future {
     /// # Examples
     ///
     /// ```
-    /// #![feature(async_await, futures_api)]
+    /// #![feature(async_await)]
     /// use futures::channel::oneshot;
     /// use futures::executor::block_on;
     /// use futures_test::future::FutureTestExt;

diff --git a/futures-test/src/lib.rs b/futures-test/src/lib.rs
@@ -1,10 +1,6 @@
 //! Utilities to make testing [`Future`s](futures_core::Future) easier
 
-#![feature(
-    async_await,
-    await_macro,
-    futures_api,
-)]
+#![feature(async_await, await_macro)]
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 #![doc(
     html_root_url = "https://rust-lang-nursery.github.io/futures-doc/0.3.0-alpha.5/futures_test"

diff --git a/futures-test/src/task/context.rs b/futures-test/src/task/context.rs
@@ -7,7 +7,6 @@ use futures_core::task::Context;
 /// # Examples
 ///
 /// ```should_panic
-/// #![feature(futures_api)]
 /// use futures_test::task::panic_context;
 ///
 /// let cx = panic_context();
@@ -23,7 +22,7 @@ pub fn panic_context() -> Context<'static> {
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::future::Future;
 /// use futures::task::Poll;
 /// use futures_test::task::noop_context;

diff --git a/futures-test/src/task/noop_spawner.rs b/futures-test/src/task/noop_spawner.rs
@@ -7,7 +7,7 @@ use futures_core::task::{Spawn, SpawnError};
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::task::SpawnExt;
 /// use futures_test::task::NoopSpawner;
 ///
@@ -46,7 +46,7 @@ impl Default for NoopSpawner {
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::task::SpawnExt;
 /// use futures_test::task::noop_spawner_mut;
 ///

diff --git a/futures-test/src/task/panic_spawner.rs b/futures-test/src/task/panic_spawner.rs
@@ -7,7 +7,7 @@ use futures_core::task::{Spawn, SpawnError};
 /// # Examples
 ///
 /// ```should_panic
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::task::SpawnExt;
 /// use futures_test::task::PanicSpawner;
 ///
@@ -46,7 +46,7 @@ impl Default for PanicSpawner {
 /// # Examples
 ///
 /// ```should_panic
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::task::SpawnExt;
 /// use futures_test::task::panic_spawner_mut;
 ///

diff --git a/futures-test/src/task/panic_waker.rs b/futures-test/src/task/panic_waker.rs
@@ -30,7 +30,6 @@ fn raw_panic_waker() -> RawWaker {
 /// # Examples
 ///
 /// ```should_panic
-/// #![feature(futures_api)]
 /// use futures_test::task::panic_waker;
 ///
 /// let waker = panic_waker();
@@ -47,7 +46,7 @@ pub fn panic_waker() -> Waker {
 /// # Examples
 ///
 /// ```should_panic
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::task;
 /// use futures_test::task::panic_waker_ref;
 ///

diff --git a/futures-test/src/task/record_spawner.rs b/futures-test/src/task/record_spawner.rs
@@ -7,7 +7,7 @@ use futures_core::task::{Spawn, SpawnError};
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, futures_api)]
+/// #![feature(async_await)]
 /// use futures::task::SpawnExt;
 /// use futures_test::task::RecordSpawner;
 ///

diff --git a/futures-test/src/task/wake_counter.rs b/futures-test/src/task/wake_counter.rs
@@ -42,7 +42,6 @@ impl ArcWake for WakerInner {
 /// # Examples
 ///
 /// ```
-/// #![feature(futures_api)]
 /// use futures_test::task::new_count_waker;
 ///
 /// let (waker, count) = new_count_waker();

diff --git a/futures-util/benches/futures_unordered.rs b/futures-util/benches/futures_unordered.rs
@@ -1,4 +1,4 @@
-#![feature(test, futures_api)]
+#![feature(test)]
 
 extern crate test;
 use crate::test::Bencher;

diff --git a/futures-util/src/async_await/join.rs b/futures-util/src/async_await/join.rs
@@ -11,7 +11,7 @@
 /// # Examples
 ///
 /// ```
-/// #![feature(async_await, await_macro, futures_api)]
+/// #![feature(async_await, await_macro)]
 /// # futures::executor::block_on(async {
 /// use futures::{join, future};
 ///
@@ -60,7 +60,7 @@ macro_rules! join {
 /// `Ok` of a tuple of the values:
 ///
 /// ```
-/// #![feature(async_await, await_macro, futures_api)]
+/// #![feature(async_await, await_macro)]
 /// # futures::executor::block_on(async {
 /// use futures::{try_join, future};
 ///
@@ -75,7 +75,7 @@ macro_rules! join {
 /// that error:
 ///
 /// ```
-/// #![feature(async_await, await_macro, futures_api)]
+/// #![feature(async_await, await_macro)]
 /// # futures::executor::block_on(async {
 /// use futures::{try_join, future};
 ///

diff --git a/futures-util/src/async_await/select_mod.rs b/futures-util/src/async_await/select_mod.rs
@@ -24,7 +24,7 @@ macro_rules! document_select_macro {
         /// # Examples
         ///
         /// ```
-        /// #![feature(async_await, await_macro, futures_api)]
+        /// #![feature(async_await, await_macro)]
         /// # futures::executor::block_on(async {
         /// use futures::future::{self, FutureExt};
         /// use futures::select;
@@ -40,7 +40,7 @@ macro_rules! document_select_macro {
         /// ```
         ///
         /// ```
-        /// #![feature(async_await, await_macro, futures_api)]
+        /// #![feature(async_await, await_macro)]
         /// # futures::executor::block_on(async {
         /// use futures::future::{self, FutureExt};
         /// use futures::stream::{self, StreamExt};
@@ -62,7 +62,7 @@ macro_rules! document_select_macro {
         /// the case where all futures have completed.
         ///
         /// ```
-        /// #![feature(async_await, await_macro, futures_api)]
+        /// #![feature(async_await, await_macro)]
         /// # futures::executor::block_on(async {
         /// use futures::future::{self, FutureExt};
         /// use futures::select;

diff --git a/futures-util/src/compat/compat01as03.rs b/futures-util/src/compat/compat01as03.rs
@@ -52,7 +52,7 @@ pub trait Future01CompatExt: Future01 {
     /// [`Future<Output = Result<T, E>>`](futures_core::future::Future).
     ///
     /// ```
-    /// #![feature(async_await, await_macro, futures_api)]
+    /// #![feature(async_await, await_macro)]
     /// # futures::executor::block_on(async {
     /// # // TODO: These should be all using `futures::compat`, but that runs up against Cargo
     /// # // feature issues
@@ -79,7 +79,7 @@ pub trait Stream01CompatExt: Stream01 {
     /// [`Stream<Item = Result<T, E>>`](futures_core::stream::Stream).
     ///
     /// ```
-    /// #![feature(async_await, await_macro, futures_api)]
+    /// #![feature(async_await, await_macro)]
     /// # futures::executor::block_on(async {
     /// use futures::stream::StreamExt;
     /// use futures_util::compat::Stream01CompatExt;
@@ -107,7 +107,7 @@ pub trait Sink01CompatExt: Sink01 {
     /// [`Sink<SinkItem = T, SinkError = E>`](futures_sink::sink::Sink).
     ///
     /// ```
-    /// #![feature(async_await, await_macro, futures_api)]
+    /// #![feature(async_await, await_macro)]
     /// # futures::executor::block_on(async {
     /// use futures::{sink::SinkExt, stream::StreamExt};
     /// use futures_util::compat::{Stream01CompatExt, Sink01CompatExt};
@@ -356,7 +356,7 @@ mod io {
         /// [`AsyncRead`](futures_io::AsyncRead).
         ///
         /// ```
-        /// #![feature(async_await, await_macro, futures_api, impl_trait_in_bindings)]
+        /// #![feature(async_await, await_macro, impl_trait_in_bindings)]
         /// # futures::executor::block_on(async {
         /// use futures::io::AsyncReadExt;
         /// use futures_util::compat::AsyncRead01CompatExt;
@@ -385,7 +385,7 @@ mod io {
         /// [`AsyncWrite`](futures_io::AsyncWrite).
         ///
         /// ```
-        /// #![feature(async_await, await_macro, futures_api, impl_trait_in_bindings)]
+        /// #![feature(async_await, await_macro, impl_trait_in_bindings)]
         /// # futures::executor::block_on(async {
         /// use futures::io::AsyncWriteExt;
         /// use futures_util::compat::AsyncWrite01CompatExt;

diff --git a/futures-util/src/compat/executor.rs b/futures-util/src/compat/executor.rs
@@ -22,7 +22,7 @@ pub trait Executor01CompatExt: Executor01<Executor01Future> +
     /// futures 0.3 [`Spawn`](futures_core::task::Spawn).
     ///
     /// ```
-    /// #![feature(async_await, await_macro, futures_api)]
+    /// #![feature(async_await, await_macro)]
     /// use futures::Future;
     /// use futures::task::SpawnExt;
     /// use futures::future::{FutureExt, TryFutureExt};