Remove #![feature(futures_api)] and usages of FutureObj

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;
 

examples/echo.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro, futures_api)]
+#![feature(async_await, await_macro)]
 
 use std::io;
 

examples/shakespeare-client.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro, futures_api)]
+#![feature(async_await, await_macro)]
 
 use std::io;
 

examples/shakespeare.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro, futures_api)]
+#![feature(async_await, await_macro)]
 
 use std::io;
 

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))]
 

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;
     ///

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::*;
 //!

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<dyn std::error::Error + 'static>> {
@@ -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<dyn std::error::Error + 'static>> {
@@ -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<dyn std::error::Error + 'static>> {
@@ -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<dyn std::error::Error + 'static>> {
@@ -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<dyn std::error::Error + 'static>> {
@@ -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<dyn std::error::Error + 'static>> {
@@ -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<dyn std::error::Error + 'static>> {
@@ -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<dyn std::error::Error + 'static>> {
@@ -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;
     ///

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;
     ///

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::*;
     ///

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::*;
 //!

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;
     ///

tests/tcp.rs

@@ -1,10 +1,9 @@
-#![feature(async_await, await_macro, futures_api)]
+#![feature(async_await, await_macro)]
 use std::io::{Read, Write};
 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);
-    })));
+    }));
 }