chore: remove tokio-futures facade crate (#1327)

This switches from using the tokio-futures facade to referencing
futures-* crates directly.

Cargo.toml

@@ -7,7 +7,6 @@ members = [
   "tokio-current-thread",
   "tokio-executor",
   "tokio-fs",
-  "tokio-futures",
   "tokio-io",
   "tokio-macros",
   "tokio-reactor",

README.md

@@ -139,8 +139,6 @@ The crates included as part of Tokio are:
 
 * [`tokio-fs`]: Filesystem (and standard in / out) APIs.
 
-* [`tokio-futures`]: Experimental `std::future::Future` and `async` / `await` support.
-
 * [`tokio-codec`]: Utilities for encoding and decoding protocol frames.
 
 * [`tokio-io`]: Asynchronous I/O related traits and utilities.
@@ -166,7 +164,6 @@ The crates included as part of Tokio are:
 [`tokio-current-thread`]: tokio-current-thread
 [`tokio-executor`]: tokio-executor
 [`tokio-fs`]: tokio-fs
-[`tokio-futures`]: tokio-futures
 [`tokio-io`]: tokio-io
 [`tokio-macros`]: tokio-macros
 [`tokio-reactor`]: tokio-reactor

ci/patch.toml

@@ -7,7 +7,6 @@ tokio-codec = { path = "tokio-codec" }
 tokio-current-thread = { path = "tokio-current-thread" }
 tokio-executor = { path = "tokio-executor" }
 tokio-fs = { path = "tokio-fs" }
-tokio-futures = { path = "tokio-futures" }
 tokio-io = { path = "tokio-io" }
 tokio-reactor = { path = "tokio-reactor" }
 tokio-signal = { path = "tokio-signal" }

tokio-codec/Cargo.toml

@@ -24,7 +24,8 @@ publish = false
 [dependencies]
 tokio-io = { version = "0.2.0", path = "../tokio-io" }
 bytes = "0.4.7"
-tokio-futures = { version = "0.2.0", path = "../tokio-futures" }
+futures-core-preview = "0.3.0-alpha.17"
+futures-sink-preview = "0.3.0-alpha.17"
 log = "0.4"
 
 [dev-dependencies]

tokio-codec/src/framed.rs

@@ -1,18 +1,19 @@
 #![allow(deprecated)]
 
-use std::fmt;
-use std::io::{self, Read, Write};
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
 use crate::decoder::Decoder;
 use crate::encoder::Encoder;
 use crate::framed_read::{framed_read2, framed_read2_with_buffer, FramedRead2};
 use crate::framed_write::{framed_write2, framed_write2_with_buffer, FramedWrite2};
-use tokio_futures::{Sink, Stream};
+
 use tokio_io::{AsyncRead, AsyncWrite};
 
 use bytes::BytesMut;
+use futures_core::Stream;
+use futures_sink::Sink;
+use std::fmt;
+use std::io::{self, Read, Write};
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
 /// A unified `Stream` and `Sink` interface to an underlying I/O object, using
 /// the `Encoder` and `Decoder` traits to encode and decode frames.

tokio-codec/src/framed_read.rs

@@ -1,14 +1,15 @@
-use std::fmt;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
 use super::framed::Fuse;
 use super::Decoder;
-use tokio_futures::{Sink, Stream};
+
 use tokio_io::AsyncRead;
 
 use bytes::BytesMut;
+use futures_core::Stream;
+use futures_sink::Sink;
 use log::trace;
+use std::fmt;
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
 /// A `Stream` of messages decoded from an `AsyncRead`.
 pub struct FramedRead<T, D> {

tokio-codec/src/framed_write.rs

@@ -1,16 +1,17 @@
 #![allow(deprecated)]
 
-use log::trace;
-use std::fmt;
-use std::io::{self, Read};
-
 use super::framed::Fuse;
 use crate::decoder::Decoder;
 use crate::encoder::Encoder;
-use tokio_futures::{Sink, Stream};
+
 use tokio_io::{AsyncRead, AsyncWrite};
 
 use bytes::BytesMut;
+use futures_core::{ready, Stream};
+use futures_sink::Sink;
+use log::trace;
+use std::fmt;
+use std::io::{self, Read};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -208,7 +209,7 @@ where
             trace!("writing; remaining={}", pinned.buffer.len());
 
             let buf = &pinned.buffer;
-            let n = try_ready!(pin!(pinned.inner).poll_write(cx, &buf));
+            let n = ready!(pin!(pinned.inner).poll_write(cx, &buf))?;
 
             if n == 0 {
                 return Poll::Ready(Err(io::Error::new(
@@ -224,15 +225,16 @@ where
         }
 
         // Try flushing the underlying IO
-        try_ready!(pin!(pinned.inner).poll_flush(cx));
+        ready!(pin!(pinned.inner).poll_flush(cx))?;
 
         trace!("framed transport flushed");
         Poll::Ready(Ok(()))
     }
 
     fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        let () = try_ready!(pin!(self).poll_flush(cx));
+        ready!(pin!(self).poll_flush(cx))?;
-        let () = try_ready!(pin!(self.inner).poll_shutdown(cx));
+        ready!(pin!(self.inner).poll_shutdown(cx))?;
+
         Poll::Ready(Ok(()))
     }
 }

tokio-codec/src/macros.rs

@@ -1,18 +1,3 @@
-// TODO this macro should probably be somewhere in tokio-futures
-/// A macro for extracting the successful type of a `Poll<T, E>`.
-///
-/// This macro bakes propagation of both errors and `Pending` signals by
-/// returning early.
-macro_rules! try_ready {
-    ($e:expr) => {
-        match $e {
-            std::task::Poll::Pending => return std::task::Poll::Pending,
-            std::task::Poll::Ready(Err(e)) => return std::task::Poll::Ready(Err(From::from(e))),
-            std::task::Poll::Ready(Ok(t)) => t,
-        }
-    };
-}
-
 /// A macro to reduce some of the boilerplate for projecting from
 /// `Pin<&mut T>` to `Pin<&mut T.field>`
 macro_rules! pin {

tokio-codec/tests/framed_write.rs

@@ -1,13 +1,13 @@
 #![deny(warnings, rust_2018_idioms)]
 
-use bytes::{BufMut, BytesMut};
-use std::collections::VecDeque;
 use tokio_codec::{Encoder, FramedWrite};
-use tokio_futures::Sink;
 use tokio_io::AsyncWrite;
 use tokio_test::assert_ready;
 use tokio_test::task::MockTask;
 
+use bytes::{BufMut, BytesMut};
+use futures_sink::Sink;
+use std::collections::VecDeque;
 use std::io::{self, Write};
 use std::pin::Pin;
 use std::task::Poll::{Pending, Ready};

tokio-fs/Cargo.toml

@@ -27,7 +27,6 @@ publish = false
 futures-core-preview = "0.3.0-alpha.17"
 tokio-threadpool = { version = "0.2.0", path = "../tokio-threadpool" }
 tokio-io = { version = "0.2.0", path = "../tokio-io" }
-tokio-futures = { version = "0.2.0", path = "../tokio-futures" }
 
 [dev-dependencies]
 rand = "0.7"

tokio-fs/src/file/clone.rs

@@ -1,4 +1,5 @@
 use super::File;
+
 use std::future::Future;
 use std::io;
 use std::pin::Pin;

tokio-fs/src/file/create.rs

@@ -1,4 +1,6 @@
 use super::File;
+
+use futures_core::ready;
 use std::fs::File as StdFile;
 use std::future::Future;
 use std::io;

tokio-fs/src/file/metadata.rs

@@ -1,4 +1,6 @@
 use super::File;
+
+use futures_core::ready;
 use std::fs::File as StdFile;
 use std::fs::Metadata;
 use std::future::Future;

tokio-fs/src/file/mod.rs

@@ -16,13 +16,14 @@ pub use self::open::OpenFuture;
 pub use self::open_options::OpenOptions;
 pub use self::seek::SeekFuture;
 
+use tokio_io::{AsyncRead, AsyncWrite};
+
 use std::fs::{File as StdFile, Metadata, Permissions};
 use std::io::{self, Read, Seek, Write};
 use std::path::Path;
 use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
-use tokio_io::{AsyncRead, AsyncWrite};
 
 /// A reference to an open file on the filesystem.
 ///

tokio-fs/src/file/open.rs

@@ -1,4 +1,6 @@
 use super::File;
+
+use futures_core::ready;
 use std::fs::OpenOptions as StdOpenOptions;
 use std::future::Future;
 use std::io;

tokio-fs/src/file/open_options.rs

@@ -1,4 +1,5 @@
 use super::OpenFuture;
+
 use std::convert::From;
 use std::fs::OpenOptions as StdOpenOptions;
 use std::path::Path;

tokio-fs/src/file/seek.rs

@@ -1,4 +1,6 @@
 use super::File;
+
+use futures_core::ready;
 use std::future::Future;
 use std::io;
 use std::pin::Pin;

tokio-fs/src/lib.rs

@@ -30,9 +30,6 @@
 //! [`AsyncRead`]: https://docs.rs/tokio-io/0.1/tokio_io/trait.AsyncRead.html
 //! [tokio-threadpool]: https://docs.rs/tokio-threadpool/0.1/tokio_threadpool
 
-#[macro_use]
-extern crate tokio_futures;
-
 mod create_dir;
 mod create_dir_all;
 pub mod file;

tokio-fs/src/metadata.rs

@@ -1,4 +1,5 @@
 use super::blocking_io;
+
 use std::fs::{self, Metadata};
 use std::future::Future;
 use std::io;

tokio-fs/src/read.rs

@@ -1,11 +1,13 @@
 use crate::{file, File};
+
+use tokio_io::AsyncRead;
+
+use futures_core::ready;
 use std::future::Future;
 use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
 use std::{io, mem, path::Path};
-use tokio_io;
-use tokio_io::AsyncRead;
 
 /// Creates a future which will open a file for reading and read the entire
 /// contents into a buffer and return said buffer.

tokio-fs/src/stderr.rs

@@ -1,8 +1,9 @@
+use tokio_io::AsyncWrite;
+
 use std::io::{self, Stderr as StdStderr, Write};
 use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
-use tokio_io::AsyncWrite;
 
 /// A handle to the standard error stream of a process.
 ///

tokio-fs/src/stdin.rs

@@ -1,8 +1,9 @@
+use tokio_io::AsyncRead;
+
 use std::io::{self, Read, Stdin as StdStdin};
 use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
-use tokio_io::AsyncRead;
 
 /// A handle to the standard input stream of a process.
 ///

tokio-fs/src/stdout.rs

@@ -1,8 +1,9 @@
+use tokio_io::AsyncWrite;
+
 use std::io::{self, Stdout as StdStdout, Write};
 use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
-use tokio_io::AsyncWrite;
 
 /// A handle to the standard output stream of a process.
 ///

tokio-fs/src/symlink_metadata.rs

@@ -1,4 +1,5 @@
 use super::blocking_io;
+
 use std::fs::{self, Metadata};
 use std::future::Future;
 use std::io;

tokio-fs/src/write.rs

@@ -1,11 +1,13 @@
 use crate::{file, File};
+
+use tokio_io::AsyncWrite;
+
+use futures_core::ready;
 use std::future::Future;
 use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
 use std::{fmt, io, mem, path::Path};
-use tokio_io;
-use tokio_io::AsyncWrite;
 
 /// Creates a future that will open a file for writing and write the entire
 /// contents of `contents` to it.

tokio-futures/Cargo.toml

@@ -1,27 +0,0 @@
-[package]
-name = "tokio-futures"
-
-# When releasing to crates.io:
-# - Update html_root_url.
-version = "0.2.0"
-edition = "2018"
-authors = ["Carl Lerche <[email protected]>"]
-license = "MIT"
-repository = "https://github.com/tokio-rs/tokio"
-homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-futures/0.1.0"
-description = """
-Utilities for working with futures, async, and await.
-"""
-categories = ["asynchronous"]
-publish = false
-
-[features]
-all = []
-default = [
-  "all",
-]
-
-[dependencies]
-futures-core-preview = "0.3.0-alpha.17"
-futures-sink-preview = "0.3.0-alpha.17"

tokio-futures/LICENSE

@@ -1,52 +0,0 @@
-Copyright (c) 2019 Tokio Contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-Copyright (c) 2016 futures-rs authors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-

tokio-futures/README.md

@@ -1,13 +0,0 @@
-# Tokio Futures
-
-Asynchronous abstractions for the Tokio stack.
-
-## License
-
-This project is licensed under the [MIT license](LICENSE).
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Tokio by you, shall be licensed as MIT, without any additional
-terms or conditions.

tokio-futures/src/future.rs

@@ -1,3 +0,0 @@
-//! Futures
-
-pub use core::future::Future;

tokio-futures/src/lib.rs

@@ -1,16 +0,0 @@
-#![doc(html_root_url = "https://docs.rs/tokio-futures/0.2.0")]
-#![cfg(feature = "all")]
-#![deny(missing_docs, missing_debug_implementations, rust_2018_idioms)]
-#![cfg_attr(test, deny(warnings))]
-
-//! Futures
-
-pub mod future;
-pub mod sink;
-pub mod stream;
-
-pub use crate::future::Future;
-pub use crate::sink::Sink;
-pub use crate::stream::Stream;
-
-pub use futures_core::ready;

tokio-futures/src/sink.rs

@@ -1,3 +0,0 @@
-//! Sinks
-
-pub use futures_sink::Sink;

tokio-futures/src/stream.rs

@@ -1,3 +0,0 @@
-//! Streams
-
-pub use futures_core::stream::Stream;

tokio-sync/Cargo.toml

@@ -22,13 +22,13 @@ categories = ["asynchronous"]
 publish = false
 
 [features]
-async-traits = ["tokio-futures"]
+async-traits = ["futures-sink-preview"]
 
 [dependencies]
 async-util = { git = "https://github.com/tokio-rs/async" }
-tokio-futures = { path = "../tokio-futures", optional = true }
 fnv = "1.0.6"
 futures-core-preview = { version = "0.3.0-alpha.17" }
+futures-sink-preview = { version = "0.3.0-alpha.17", optional = true }
 
 [dev-dependencies]
 env_logger = { version = "0.5", default-features = false }

tokio-sync/src/mpsc/bounded.rs

@@ -214,7 +214,7 @@ impl<T> Sender<T> {
 }
 
 #[cfg(feature = "async-traits")]
-impl<T> tokio_futures::Sink<T> for Sender<T> {
+impl<T> futures_sink::Sink<T> for Sender<T> {
     type Error = SendError;
 
     fn poll_ready(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {

tokio-sync/src/mpsc/unbounded.rs

@@ -130,7 +130,7 @@ impl<T> UnboundedSender<T> {
 }
 
 #[cfg(feature = "async-traits")]
-impl<T> tokio_futures::Sink<T> for UnboundedSender<T> {
+impl<T> futures_sink::Sink<T> for UnboundedSender<T> {
     type Error = UnboundedSendError;
 
     fn poll_ready(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {

tokio-sync/src/watch.rs

@@ -368,7 +368,7 @@ impl<T> Sender<T> {
 }
 
 #[cfg(feature = "async-traits")]
-impl<T> tokio_futures::Sink<T> for Sender<T> {
+impl<T> futures_sink::Sink<T> for Sender<T> {
     type Error = error::SendError<T>;
 
     fn poll_ready(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {

tokio-sync/tests/mpsc.rs

@@ -57,8 +57,8 @@ async fn async_send_recv_with_buffer() {
 #[cfg(feature = "async-traits")]
 fn send_sink_recv_with_buffer() {
     use futures_core::Stream;
+    use futures_sink::Sink;
     use pin_utils::pin_mut;
-    use tokio_futures::Sink;
 
     let mut t1 = MockTask::new();
 
@@ -170,8 +170,8 @@ async fn async_send_recv_unbounded() {
 #[cfg(feature = "async-traits")]
 fn sink_send_recv_unbounded() {
     use futures_core::Stream;
+    use futures_sink::Sink;
     use pin_utils::pin_mut;
-    use tokio_futures::Sink;
 
     let mut t1 = MockTask::new();
 

tokio/Cargo.toml

@@ -40,7 +40,7 @@ default = [
 
 codec = ["io", "tokio-codec"]
 fs = ["tokio-fs"]
-io = ["bytes", "tokio-io", "tokio-futures", "memchr"]
+io = ["bytes", "tokio-io", "memchr"]
 reactor = ["io", "tokio-reactor"]
 rt-full = [
   "num_cpus",
@@ -82,9 +82,6 @@ tokio-timer = { version = "0.3.0", optional = true, path = "../tokio-timer" }
 tracing-core = { version = "0.1", optional = true }
 memchr = { version = "2.2", optional = true }
 
-# Needed for async/await preview support
-tokio-futures = { version = "0.2.0", optional = true, path = "../tokio-futures" }
-
 [target.'cfg(unix)'.dependencies]
 tokio-uds = { version = "0.3.0", optional = true, path = "../tokio-uds" }
 

tokio/src/io/lines.rs

@@ -1,11 +1,12 @@
 use super::read_line::read_line_internal;
-use futures_core::ready;
+
+use tokio_io::AsyncBufRead;
+
+use futures_core::{ready, Stream};
 use std::io;
 use std::mem;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio_futures::Stream;
-use tokio_io::AsyncBufRead;
 
 /// Stream for the [`lines`](crate::io::AsyncBufReadExt::lines) method.
 #[derive(Debug)]