From 5f4848803f661c9ddf6542726cc004a1c776bcff Mon Sep 17 00:00:00 2001 From: Joey Hain Date: Thu, 25 Apr 2019 14:54:04 -0700 Subject: [PATCH 1/2] Remove #![feature(futures_api)] --- README.md | 4 ++-- examples/echo.rs | 2 +- examples/shakespeare-client.rs | 2 +- examples/shakespeare.rs | 2 +- src/lib.rs | 5 ++--- src/tcp/listener.rs | 8 ++++---- src/tcp/mod.rs | 2 +- src/tcp/stream.rs | 32 ++++++++++++++++---------------- src/udp.rs | 4 ++-- src/uds/listener.rs | 4 ++-- src/uds/mod.rs | 2 +- src/uds/stream.rs | 14 +++++++------- tests/tcp.rs | 2 +- tests/uds.rs | 2 +- 14 files changed, 42 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 035aaf1d..478fc2eb 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ the quote it received to standard out. ### Shakespeare Server ```rust -#![feature(async_await, await_macro, futures_api)] +#![feature(async_await, await_macro)] use std::io; @@ -101,7 +101,7 @@ async fn recite_shakespeare(mut stream: TcpStream) -> io::Result<()> { ### Shakespeare Client ```rust -#![feature(async_await, await_macro, futures_api)] +#![feature(async_await, await_macro)] use std::io; diff --git a/examples/echo.rs b/examples/echo.rs index 01852a50..fdf03991 100644 --- a/examples/echo.rs +++ b/examples/echo.rs @@ -1,4 +1,4 @@ -#![feature(async_await, await_macro, futures_api)] +#![feature(async_await, await_macro)] use std::io; diff --git a/examples/shakespeare-client.rs b/examples/shakespeare-client.rs index c8966d4c..c5aeab59 100644 --- a/examples/shakespeare-client.rs +++ b/examples/shakespeare-client.rs @@ -1,4 +1,4 @@ -#![feature(async_await, await_macro, futures_api)] +#![feature(async_await, await_macro)] use std::io; diff --git a/examples/shakespeare.rs b/examples/shakespeare.rs index eca8bea0..eb3163e2 100644 --- a/examples/shakespeare.rs +++ b/examples/shakespeare.rs @@ -1,4 +1,4 @@ -#![feature(async_await, await_macro, futures_api)] +#![feature(async_await, await_macro)] use std::io; diff --git a/src/lib.rs b/src/lib.rs index 688ed679..e7369452 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,7 +18,7 @@ //! # Examples //! __TCP Server__ //! ```rust -//! #![feature(async_await, await_macro, futures_api)] +//! #![feature(async_await, await_macro)] //! use romio::tcp::{TcpListener, TcpStream}; //! use futures::prelude::*; //! @@ -40,7 +40,7 @@ //! ``` //! __TCP Client__ //! ```rust,no_run -//! #![feature(async_await, await_macro, futures_api)] +//! #![feature(async_await, await_macro)] //! use std::error::Error; //! use futures::prelude::*; //! use romio::tcp::{TcpListener, TcpStream}; @@ -56,7 +56,6 @@ //! } //! ``` -#![feature(futures_api)] #![deny(missing_docs, missing_debug_implementations)] #![cfg_attr(test, deny(warnings))] diff --git a/src/tcp/listener.rs b/src/tcp/listener.rs index ccaf93b4..d60382e1 100644 --- a/src/tcp/listener.rs +++ b/src/tcp/listener.rs @@ -27,7 +27,7 @@ use crate::raw::PollEvented; /// # Examples /// /// ```rust,no_run -/// #![feature(async_await, await_macro, futures_api)] +/// #![feature(async_await, await_macro)] /// use std::error::Error; /// /// use romio::tcp::{TcpListener, TcpStream}; @@ -125,7 +125,7 @@ impl TcpListener { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use futures::prelude::*; /// use romio::tcp::TcpListener; /// @@ -158,7 +158,7 @@ impl TcpListener { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use futures::prelude::*; /// use romio::tcp::TcpListener; /// @@ -181,7 +181,7 @@ impl TcpListener { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use futures::prelude::*; /// use romio::tcp::TcpListener; /// diff --git a/src/tcp/mod.rs b/src/tcp/mod.rs index 1d11c2b8..eb0859bc 100644 --- a/src/tcp/mod.rs +++ b/src/tcp/mod.rs @@ -19,7 +19,7 @@ //! # Example //! //! ```no_run -//! #![feature(async_await, await_macro, futures_api)] +//! #![feature(async_await, await_macro)] //! use romio::tcp::{TcpListener, TcpStream}; //! use futures::prelude::*; //! diff --git a/src/tcp/stream.rs b/src/tcp/stream.rs index 6a866761..94d1b3e7 100644 --- a/src/tcp/stream.rs +++ b/src/tcp/stream.rs @@ -61,7 +61,7 @@ impl TcpStream { /// # Examples /// /// ```no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// # use std::io; /// use romio::tcp::TcpStream; /// @@ -91,7 +91,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// use std::net::{IpAddr, Ipv4Addr}; /// @@ -112,7 +112,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4}; /// @@ -137,7 +137,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// use std::net::Shutdown; /// @@ -161,7 +161,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -187,7 +187,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -210,7 +210,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -233,7 +233,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -256,7 +256,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -279,7 +279,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -303,7 +303,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// use std::time::Duration; /// @@ -335,7 +335,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// use std::time::Duration; /// @@ -359,7 +359,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -382,7 +382,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// /// # async fn run () -> Result<(), Box> { @@ -406,7 +406,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// use std::time::Duration; /// @@ -437,7 +437,7 @@ impl TcpStream { /// # Examples /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::tcp::TcpStream; /// use std::time::Duration; /// diff --git a/src/udp.rs b/src/udp.rs index d27bec9a..03ce1f3b 100644 --- a/src/udp.rs +++ b/src/udp.rs @@ -86,7 +86,7 @@ impl UdpSocket { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// # use std::error::Error; /// use romio::udp::UdpSocket; /// @@ -120,7 +120,7 @@ impl UdpSocket { /// # Exampes /// /// ```rust,no_run - /// #![feature(futures_api, async_await, await_macro)] + /// #![feature(async_await, await_macro)] /// # use std::error::Error; /// use romio::udp::UdpSocket; /// diff --git a/src/uds/listener.rs b/src/uds/listener.rs index 42741f42..de4fba12 100644 --- a/src/uds/listener.rs +++ b/src/uds/listener.rs @@ -19,7 +19,7 @@ use std::task::Context; /// # Examples /// /// ```no_run -/// #![feature(async_await, await_macro, futures_api)] +/// #![feature(async_await, await_macro)] /// use romio::uds::{UnixListener, UnixStream}; /// use futures::prelude::*; /// @@ -88,7 +88,7 @@ impl UnixListener { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixListener; /// use futures::prelude::*; /// diff --git a/src/uds/mod.rs b/src/uds/mod.rs index 83e30c56..2f4f5551 100644 --- a/src/uds/mod.rs +++ b/src/uds/mod.rs @@ -3,7 +3,7 @@ //! # Example //! //! ```no_run -//! #![feature(async_await, await_macro, futures_api)] +//! #![feature(async_await, await_macro)] //! use romio::uds::{UnixListener, UnixStream}; //! use futures::prelude::*; //! diff --git a/src/uds/stream.rs b/src/uds/stream.rs index f2de91a1..e8c17675 100644 --- a/src/uds/stream.rs +++ b/src/uds/stream.rs @@ -51,7 +51,7 @@ impl UnixStream { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixStream; /// /// # async fn run() -> std::io::Result<()> { @@ -78,7 +78,7 @@ impl UnixStream { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixStream; /// /// # async fn run() -> std::io::Result<()> { @@ -103,7 +103,7 @@ impl UnixStream { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixStream; /// /// # async fn run() -> std::io::Result<()> { @@ -120,7 +120,7 @@ impl UnixStream { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixStream; /// /// # async fn run() -> std::io::Result<()> { @@ -137,7 +137,7 @@ impl UnixStream { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixStream; /// /// # async fn run() -> std::io::Result<()> { @@ -156,7 +156,7 @@ impl UnixStream { /// (see the documentation of `Shutdown`). /// /// ```rust - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixStream; /// use std::net::Shutdown; /// @@ -266,7 +266,7 @@ impl TakeError for UnixStream { /// # Examples /// /// ```rust,no_run - /// #![feature(async_await, await_macro, futures_api)] + /// #![feature(async_await, await_macro)] /// use romio::uds::UnixStream; /// use romio::raw::TakeError; /// diff --git a/tests/tcp.rs b/tests/tcp.rs index b16c25fb..1b16bea8 100644 --- a/tests/tcp.rs +++ b/tests/tcp.rs @@ -1,4 +1,4 @@ -#![feature(async_await, await_macro, futures_api)] +#![feature(async_await, await_macro)] use std::io::{Read, Write}; use std::net::TcpStream; use std::thread; diff --git a/tests/uds.rs b/tests/uds.rs index 9080df6c..cc9d21e7 100644 --- a/tests/uds.rs +++ b/tests/uds.rs @@ -1,5 +1,5 @@ #![cfg(any(unix, macos))] -#![feature(async_await, await_macro, futures_api)] +#![feature(async_await, await_macro)] use std::io::{Read, Write}; use std::os::unix::net::UnixStream as StdStream; use std::thread; From 6973de3c9b3b028f0b8301c30667dc40e8cfdf53 Mon Sep 17 00:00:00 2001 From: Joey Hain Date: Thu, 25 Apr 2019 14:54:40 -0700 Subject: [PATCH 2/2] Remove usage of FutureObj --- tests/tcp.rs | 9 ++++----- tests/uds.rs | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/tcp.rs b/tests/tcp.rs index 1b16bea8..1765218a 100644 --- a/tests/tcp.rs +++ b/tests/tcp.rs @@ -4,7 +4,6 @@ use std::net::TcpStream; use std::thread; use futures::executor; -use futures::future::FutureObj; use futures::io::{AsyncReadExt, AsyncWriteExt}; use futures::StreamExt; @@ -67,16 +66,16 @@ fn both_sides_async_using_threadpool() { let mut pool = executor::ThreadPool::new().unwrap(); - pool.run(FutureObj::from(Box::pin(async move { + pool.run(Box::pin(async move { let mut client = await!(romio::TcpStream::connect(&addr)).unwrap(); await!(client.write_all(THE_WINTERS_TALE)).unwrap(); - }))); + })); - pool.run(FutureObj::from(Box::pin(async { + pool.run(Box::pin(async { let mut buf = vec![0; THE_WINTERS_TALE.len()]; let mut incoming = server.incoming(); let mut stream = await!(incoming.next()).unwrap().unwrap(); await!(stream.read_exact(&mut buf)).unwrap(); assert_eq!(buf, THE_WINTERS_TALE); - }))); + })); } diff --git a/tests/uds.rs b/tests/uds.rs index cc9d21e7..e0959aa2 100644 --- a/tests/uds.rs +++ b/tests/uds.rs @@ -4,7 +4,7 @@ use std::io::{Read, Write}; use std::os::unix::net::UnixStream as StdStream; use std::thread; -use futures::future::{self, FutureObj}; +use futures::future; use futures::io::{AsyncRead, AsyncReadExt, AsyncWriteExt}; use futures::{executor, Poll, Stream, StreamExt}; use log::{error, info}; @@ -88,19 +88,19 @@ fn both_sides_async_using_threadpool() -> Result<(), Error> { let mut pool = executor::ThreadPool::new().unwrap(); - pool.run(FutureObj::from(Box::pin(async move { + pool.run(Box::pin(async move { let file_path = file_path.as_pathname().unwrap(); let mut client = await!(UnixStream::connect(&file_path)).unwrap(); await!(client.write_all(THE_WINTERS_TALE)).unwrap(); - }))); + })); - pool.run(FutureObj::from(Box::pin(async { + pool.run(Box::pin(async { let mut buf = vec![0; THE_WINTERS_TALE.len()]; let mut incoming = listener.incoming(); let mut stream = await!(incoming.next()).unwrap().unwrap(); await!(stream.read_exact(&mut buf)).unwrap(); assert_eq!(buf, THE_WINTERS_TALE); - }))); + })); Ok(()) }