Replace await! macro with await syntax

README.md

@@ -40,7 +40,7 @@ the quote it received to standard out.
 ### Shakespeare Server
 
 ```rust
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use std::io;
 
@@ -73,14 +73,14 @@ fn main() -> io::Result<()> {
 
         println!("Listening on 127.0.0.1:7878");
 
-        while let Some(stream) = await!(incoming.next()) {
+        while let Some(stream) = incoming.next().await {
             let stream = stream?;
             let addr = stream.peer_addr()?;
 
             threadpool.spawn(async move {
                 println!("Accepting stream from: {}", addr);
 
-                await!(recite_shakespeare(stream)).unwrap();
+                recite_shakespeare(stream).await.unwrap();
 
                 println!("Closing stream from: {}", addr);
             }).unwrap();
@@ -93,15 +93,15 @@ fn main() -> io::Result<()> {
 async fn recite_shakespeare(mut stream: TcpStream) -> io::Result<()> {
     //stream.set_keepalive(None);
     let &quote = SHAKESPEARE.choose(&mut rand::thread_rng()).unwrap();
-    await!(stream.write_all(quote))?;
+    stream.write_all(quote).await?;
     Ok(())
 }
 ```
 
 ### Shakespeare Client
 
 ```rust
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use std::io;
 
@@ -112,9 +112,9 @@ use romio::TcpStream;
 
 fn main() -> io::Result<()> {
     executor::block_on(async {
-        let mut stream = await!(TcpStream::connect(&"127.0.0.1:7878".parse().unwrap()))?;
+        let mut stream = TcpStream::connect(&"127.0.0.1:7878".parse().unwrap()).await?;
         let mut stdout = AllowStdIo::new(io::stdout());
-        await!(stream.copy_into(&mut stdout))?;
+        stream.copy_into(&mut stdout).await?;
         Ok(())
     })
 }

examples/echo.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use std::io;
 
@@ -18,15 +18,15 @@ fn main() -> io::Result<()> {
 
         println!("Listening on 127.0.0.1:7878");
 
-        while let Some(stream) = await!(incoming.next()) {
+        while let Some(stream) = incoming.next().await {
             let stream = stream?;
             let addr = stream.peer_addr()?;
 
             threadpool
                 .spawn(async move {
                     println!("Accepting stream from: {}", addr);
 
-                    await!(echo_on(stream)).unwrap();
+                    echo_on(stream).await.unwrap();
 
                     println!("Closing stream from: {}", addr);
                 })
@@ -39,6 +39,6 @@ fn main() -> io::Result<()> {
 
 async fn echo_on(stream: TcpStream) -> io::Result<()> {
     let (mut reader, mut writer) = stream.split();
-    await!(reader.copy_into(&mut writer))?;
+    reader.copy_into(&mut writer).await?;
     Ok(())
 }

examples/shakespeare-client.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use std::io;
 
@@ -9,9 +9,9 @@ use romio::TcpStream;
 
 fn main() -> io::Result<()> {
     executor::block_on(async {
-        let mut stream = await!(TcpStream::connect(&"127.0.0.1:7878".parse().unwrap()))?;
+        let mut stream = TcpStream::connect(&"127.0.0.1:7878".parse().unwrap()).await?;
         let mut stdout = AllowStdIo::new(io::stdout());
-        await!(stream.copy_into(&mut stdout))?;
+        stream.copy_into(&mut stdout).await?;
         Ok(())
     })
 }

examples/shakespeare.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use std::io;
 
@@ -31,15 +31,15 @@ fn main() -> io::Result<()> {
 
         println!("Listening on 127.0.0.1:7878");
 
-        while let Some(stream) = await!(incoming.next()) {
+        while let Some(stream) = incoming.next().await {
             let stream = stream?;
             let addr = stream.peer_addr()?;
 
             threadpool
                 .spawn(async move {
                     println!("Accepting stream from: {}", addr);
 
-                    await!(recite_shakespeare(stream)).unwrap();
+                    recite_shakespeare(stream).await.unwrap();
 
                     println!("Closing stream from: {}", addr);
                 })
@@ -53,6 +53,6 @@ fn main() -> io::Result<()> {
 async fn recite_shakespeare(mut stream: TcpStream) -> io::Result<()> {
     //stream.set_keepalive(None);
     let &quote = SHAKESPEARE.choose(&mut rand::thread_rng()).unwrap();
-    await!(stream.write_all(quote))?;
+    stream.write_all(quote).await?;
     Ok(())
 }

src/lib.rs

@@ -18,12 +18,12 @@
 //! # Examples
 //! __TCP Server__
 //! ```rust
-//! #![feature(async_await, await_macro)]
+//! #![feature(async_await)]
 //! use romio::tcp::{TcpListener, TcpStream};
 //! use futures::prelude::*;
 //!
 //! async fn say_hello(mut stream: TcpStream) {
-//!     await!(stream.write_all(b"Shall I hear more, or shall I speak at this?"));
+//!     stream.write_all(b"Shall I hear more, or shall I speak at this?").await;
 //! }
 //!
 //! async fn listen() -> Result<(), Box<dyn std::error::Error + 'static>> {
@@ -32,25 +32,25 @@
 //!     let mut incoming = listener.incoming();
 //!
 //!     // accept connections and process them serially
-//!     while let Some(stream) = await!(incoming.next()) {
-//!         await!(say_hello(stream?));
+//!     while let Some(stream) = incoming.next().await {
+//!         say_hello(stream?).await;
 //!     }
 //!     Ok(())
 //! }
 //! ```
 //! __TCP Client__
 //! ```rust,no_run
-//! #![feature(async_await, await_macro)]
+//! #![feature(async_await)]
 //! use std::error::Error;
 //! use futures::prelude::*;
 //! use romio::tcp::{TcpListener, TcpStream};
 //!
 //! async fn receive_sonnet() -> Result<(), Box<dyn Error + 'static>> {
 //!     let socket_addr = "127.0.0.1:8080".parse()?;
 //!     let mut buffer = vec![];
-//!     let mut stream = await!(TcpStream::connect(&socket_addr))?;
+//!     let mut stream = TcpStream::connect(&socket_addr).await?;
 //!
-//!     await!(stream.read(&mut buffer))?;
+//!     stream.read(&mut buffer).await?;
 //!     println!("{:?}", buffer);
 //!     Ok(())
 //! }

src/tcp/listener.rs

@@ -27,14 +27,14 @@ use crate::raw::PollEvented;
 /// # Examples
 ///
 /// ```rust,no_run
-/// #![feature(async_await, await_macro)]
+/// #![feature(async_await)]
 /// use std::error::Error;
 ///
 /// use romio::tcp::{TcpListener, TcpStream};
 /// use futures::prelude::*;
 ///
 /// async fn recite_shakespeare(mut stream: TcpStream) {
-///     await!(stream.write_all(b"Shall I hear more, or shall I speak at this?"));
+///     stream.write_all(b"Shall I hear more, or shall I speak at this?").await;
 /// }
 ///
 /// async fn listen() -> Result<(), Box<dyn Error + 'static>> {
@@ -43,8 +43,8 @@ use crate::raw::PollEvented;
 ///     let mut incoming = listener.incoming();
 ///
 ///     // accept connections and process them serially
-///     while let Some(stream) = await!(incoming.next()) {
-///         await!(recite_shakespeare(stream?));
+///     while let Some(stream) = incoming.next().await {
+///         recite_shakespeare(stream?).await;
 ///     }
 ///     Ok(())
 /// }
@@ -125,7 +125,7 @@ impl TcpListener {
     /// # Examples
     ///
     /// ```rust,no_run
-    /// #![feature(async_await, await_macro)]
+    /// #![feature(async_await)]
     /// use futures::prelude::*;
     /// use romio::tcp::TcpListener;
     ///
@@ -135,7 +135,7 @@ impl TcpListener {
     /// let mut incoming = listener.incoming();
     ///
     /// // accept connections and process them serially
-    /// while let Some(stream) = await!(incoming.next()) {
+    /// while let Some(stream) = incoming.next().await {
     ///     match stream {
     ///         Ok(stream) => {
     ///             println!("new client!");
@@ -158,7 +158,7 @@ impl TcpListener {
     /// # Examples
     ///
     /// ```rust
-    /// #![feature(async_await, await_macro)]
+    /// #![feature(async_await)]
     /// use futures::prelude::*;
     /// use romio::tcp::TcpListener;
     ///
@@ -181,7 +181,7 @@ impl TcpListener {
     /// # Examples
     ///
     /// ```rust,no_run
-    /// #![feature(async_await, await_macro)]
+    /// #![feature(async_await)]
     /// use futures::prelude::*;
     /// use romio::tcp::TcpListener;
     ///

src/tcp/mod.rs

@@ -19,12 +19,12 @@
 //! # Example
 //!
 //! ```no_run
-//! #![feature(async_await, await_macro)]
+//! #![feature(async_await)]
 //! use romio::tcp::{TcpListener, TcpStream};
 //! use futures::prelude::*;
 //!
 //! async fn say_hello(mut stream: TcpStream) {
-//!     await!(stream.write_all(b"Shall I hear more, or shall I speak at this?!"));
+//!     stream.write_all(b"Shall I hear more, or shall I speak at this?!").await;
 //! }
 //!
 //! async fn listen() -> Result<(), Box<dyn std::error::Error + 'static>> {
@@ -33,8 +33,8 @@
 //!     let mut incoming = listener.incoming();
 //!
 //!     // accept connections and process them serially
-//!     while let Some(stream) = await!(incoming.next()) {
-//!         await!(say_hello(stream?));
+//!     while let Some(stream) = incoming.next().await {
+//!         say_hello(stream?).await;
 //!     }
 //!     Ok(())
 //! }