Replace await! macro with await syntax

Author: taiki-e

README.md

@@ -69,7 +69,7 @@ asynchronous software.
 ## Examples
 __UDP Echo Server__
 ```rust
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use runtime::net::UdpSocket;
 
@@ -81,8 +81,8 @@ async fn main() -> std::io::Result<()> {
     println!("Listening on {}", socket.local_addr()?);
 
     loop {
-        let (recv, peer) = await!(socket.recv_from(&mut buf))?;
-        let sent = await!(socket.send_to(&buf[..recv], &peer))?;
+        let (recv, peer) = socket.recv_from(&mut buf).await?;
+        let sent = socket.send_to(&buf[..recv], &peer).await?;
         println!("Sent {} out of {} bytes to {}", sent, recv, peer);
     }
 }

benches/baseline.rs

@@ -1,4 +1,4 @@
-#![feature(test, async_await, await_macro)]
+#![feature(test, async_await)]
 
 extern crate test;
 
@@ -43,13 +43,13 @@ mod baseline {
                 let tasks = (0..300)
                     .map(|_| {
                         spawn(async move {
-                            await!(Task { depth: 0 });
+                            Task { depth: 0 }.await;
                         })
                     })
                     .collect::<Vec<_>>();
 
                 for task in tasks {
-                    await!(task);
+                    task.await;
                 }
             })
         });
@@ -62,7 +62,7 @@ mod baseline {
                 let tasks = (0..25_000).map(|_| spawn(async {})).collect::<Vec<_>>();
 
                 for task in tasks {
-                    await!(task);
+                    task.await;
                 }
             })
         });
@@ -106,7 +106,7 @@ mod baseline {
                     .collect::<Vec<_>>();
 
                 for task in tasks {
-                    await!(task);
+                    task.await;
                 }
             })
         });
@@ -121,7 +121,7 @@ mod baseline {
         let (tx, rx) = futures::channel::oneshot::channel();
 
         let fut = async move {
-            let t = await!(fut);
+            let t = fut.await;
             let _ = tx.send(t);
         };
 

benches/common/mod.rs

@@ -31,13 +31,13 @@ macro_rules! benchmark_suite {
             let tasks = (0..300)
                 .map(|_| {
                     runtime::spawn(async {
-                        await!(Task { depth: 0 });
+                        Task { depth: 0 }.await;
                     })
                 })
                 .collect::<Vec<_>>();
 
             for task in tasks {
-                await!(task);
+                task.await;
             }
         }
 
@@ -48,7 +48,7 @@ macro_rules! benchmark_suite {
                 .collect::<Vec<_>>();
 
             for task in tasks {
-                await!(task);
+                task.await;
             }
         }
 
@@ -89,7 +89,7 @@ macro_rules! benchmark_suite {
                 .collect::<Vec<_>>();
 
             for task in tasks {
-                await!(task);
+                task.await;
             }
         }
     };

benches/native.rs

@@ -1,4 +1,4 @@
-#![feature(test, async_await, await_macro)]
+#![feature(test, async_await)]
 #![warn(rust_2018_idioms)]
 
 extern crate test;

benches/tokio.rs

@@ -1,4 +1,4 @@
-#![feature(test, async_await, await_macro)]
+#![feature(test, async_await)]
 #![warn(rust_2018_idioms)]
 
 extern crate test;

examples/guessing.rs

@@ -7,7 +7,7 @@
 //! $ nc localhost 8080
 //! ```
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use futures::prelude::*;
 use rand::Rng;
@@ -21,14 +21,14 @@ async fn play(stream: TcpStream) -> Result<(), failure::Error> {
     let (reader, writer) = &mut stream.split();
     let mut buf = vec![0u8; 1024];
 
-    await!(writer.write_all(b"Guess the number!\n"))?;
+    writer.write_all(b"Guess the number!\n").await?;
 
     let secret_number = rand::thread_rng().gen_range(1, 101);
 
     loop {
-        await!(writer.write_all(b"Please input your guess.\n"))?;
+        writer.write_all(b"Please input your guess.\n").await?;
 
-        let len = await!(reader.read(&mut buf))?;
+        let len = reader.read(&mut buf).await?;
         if len == 0 {
             return Ok(());
         }
@@ -41,13 +41,13 @@ async fn play(stream: TcpStream) -> Result<(), failure::Error> {
         };
 
         let msg = format!("You guessed: {}\n", guess);
-        await!(writer.write_all(msg.as_bytes()))?;
+        writer.write_all(msg.as_bytes()).await?;
 
         match guess.cmp(&secret_number) {
-            Ordering::Less => await!(writer.write_all(b"Too small!\n"))?,
-            Ordering::Greater => await!(writer.write_all(b"Too big!\n"))?,
+            Ordering::Less => writer.write_all(b"Too small!\n").await?,
+            Ordering::Greater => writer.write_all(b"Too big!\n").await?,
             Ordering::Equal => {
-                await!(writer.write_all(b"You win!\n"))?;
+                writer.write_all(b"You win!\n").await?;
                 break;
             }
         }
@@ -62,7 +62,7 @@ async fn main() -> Result<(), failure::Error> {
     println!("Listening on {}", &listener.local_addr()?);
 
     let mut incoming = listener.incoming();
-    while let Some(stream) = await!(incoming.next()) {
+    while let Some(stream) = incoming.next().await {
         runtime::spawn(play(stream?));
     }
     Ok(())

examples/hello.rs

@@ -1,10 +1,10 @@
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 async fn say_hi() {
     println!("Hello world! 🤖");
 }
 
 #[runtime::main]
 async fn main() {
-    await!(say_hi());
+    say_hi().await;
 }

examples/tcp-client.rs

@@ -6,22 +6,22 @@
 //! $ cargo run --example tcp-echo
 //! ```
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use futures::prelude::*;
 use runtime::net::TcpStream;
 
 #[runtime::main]
 async fn main() -> Result<(), failure::Error> {
-    let mut stream = await!(TcpStream::connect("127.0.0.1:8080"))?;
+    let mut stream = TcpStream::connect("127.0.0.1:8080").await?;
     println!("Connected to {}", &stream.peer_addr()?);
 
     let msg = "hello world";
     println!("<- {}", msg);
-    await!(stream.write_all(msg.as_bytes()))?;
+    stream.write_all(msg.as_bytes()).await?;
 
     let mut buf = vec![0u8; 1024];
-    await!(stream.read(&mut buf))?;
+    stream.read(&mut buf).await?;
     println!("-> {}\n", String::from_utf8(buf)?);
 
     Ok(())

examples/tcp-echo.rs

@@ -3,7 +3,7 @@
 //! Run the server and connect to it with `nc 127.0.0.1 8080`.
 //! The server will wait for you to enter lines of text and then echo them back.
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 use futures::prelude::*;
 use runtime::net::TcpListener;
@@ -15,13 +15,13 @@ async fn main() -> std::io::Result<()> {
 
     // accept connections and process them in parallel
     let mut incoming = listener.incoming();
-    while let Some(stream) = await!(incoming.next()) {
+    while let Some(stream) = incoming.next().await {
         runtime::spawn(async move {
             let stream = stream?;
             println!("Accepting from: {}", stream.peer_addr()?);
 
             let (reader, writer) = &mut stream.split();
-            await!(reader.copy_into(writer))?;
+            reader.copy_into(writer).await?;
             Ok::<(), std::io::Error>(())
         });
     }

examples/tcp-proxy.rs

@@ -1,6 +1,7 @@
 //! A TCP proxy server. Forwards connections from port 8081 to port 8080.
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
+#![feature(await_macro)] // TODO: When the next version of futures-preview released, remove this.
 
 use futures::prelude::*;
 use futures::try_join;
@@ -13,10 +14,10 @@ async fn main() -> std::io::Result<()> {
 
     // accept connections and process them serially
     let mut incoming = listener.incoming();
-    while let Some(client) = await!(incoming.next()) {
+    while let Some(client) = incoming.next().await {
         let handle = runtime::spawn(async move {
             let client = client?;
-            let server = await!(TcpStream::connect("127.0.0.1:8080"))?;
+            let server = TcpStream::connect("127.0.0.1:8080").await?;
             println!(
                 "Proxying {} to {}",
                 client.peer_addr()?,
@@ -32,7 +33,7 @@ async fn main() -> std::io::Result<()> {
             Ok::<(), std::io::Error>(())
         });
 
-        await!(handle)?;
+        handle.await?;
     }
     Ok(())
 }

examples/udp-client.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 //! UDP client.
 //!
@@ -16,10 +16,10 @@ async fn main() -> std::io::Result<()> {
 
     let msg = "hello world";
     println!("<- {}", msg);
-    await!(socket.send_to(msg.as_bytes(), "127.0.0.1:8080"))?;
+    socket.send_to(msg.as_bytes(), "127.0.0.1:8080").await?;
 
     let mut buf = vec![0u8; 1024];
-    await!(socket.recv_from(&mut buf))?;
+    socket.recv_from(&mut buf).await?;
     println!("-> {}\n", String::from_utf8_lossy(&mut buf));
 
     Ok(())

examples/udp-echo.rs

@@ -1,4 +1,4 @@
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 
 //! UDP echo server.
 //!
@@ -17,8 +17,8 @@ async fn main() -> std::io::Result<()> {
     println!("Listening on {}", socket.local_addr()?);
 
     loop {
-        let (recv, peer) = await!(socket.recv_from(&mut buf))?;
-        let sent = await!(socket.send_to(&buf[..recv], &peer))?;
+        let (recv, peer) = socket.recv_from(&mut buf).await?;
+        let sent = socket.send_to(&buf[..recv], &peer).await?;
         println!("Sent {} out of {} bytes to {}", sent, recv, peer);
     }
 }

runtime-attributes/src/lib.rs

@@ -3,7 +3,7 @@
 
 #![forbid(unsafe_code, future_incompatible, rust_2018_idioms)]
 #![deny(missing_debug_implementations, nonstandard_style)]
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 #![recursion_limit = "512"]
 
 extern crate proc_macro;
@@ -62,7 +62,7 @@ pub fn main(attr: TokenStream, item: TokenStream) -> TokenStream {
             }
 
             runtime::raw::enter(#rt, async {
-                await!(main())
+                main().await
             })
         }
 
@@ -120,13 +120,13 @@ pub fn test(attr: TokenStream, item: TokenStream) -> TokenStream {
 /// # Examples
 ///
 /// ```ignore
-/// #![feature(async_await, await_macro, test)]
+/// #![feature(async_await, test)]
 ///
 /// extern crate test;
 ///
 /// #[runtime::test]
 /// async fn spawn_and_await() {
-///   await!(runtime::spawn(async {}));
+///   runtime::spawn(async {}).await;
 /// }
 /// ```
 #[proc_macro_attribute]

runtime-native/src/lib.rs

@@ -1,7 +1,7 @@
 //! A cross-platform asynchronous [Runtime](https://github.com/rustasync/runtime). See the [Runtime
 //! documentation](https://docs.rs/runtime) for more details.
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 #![deny(unsafe_code)]
 #![warn(
     missing_debug_implementations,

runtime-raw/src/lib.rs

@@ -5,7 +5,7 @@
 //! perform IO, then there's no need to bother with any of these types as they will have been
 //! implemented for you already.
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 #![deny(unsafe_code)]
 #![warn(
     missing_debug_implementations,
@@ -61,7 +61,7 @@ where
     let (tx, rx) = futures::channel::oneshot::channel();
 
     let fut = async move {
-        let t = await!(fut);
+        let t = fut.await;
         let _ = tx.send(t);
     };
 

runtime-tokio/src/lib.rs

@@ -2,7 +2,7 @@
 //! [Runtime](https://github.com/rustasync/runtime). See the [Runtime
 //! documentation](https://docs.rs/runtime) for more details.
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 #![warn(
     missing_debug_implementations,
     missing_docs,

src/lib.rs

@@ -16,7 +16,7 @@
 //! ## Examples
 //! __UDP Echo Server__
 //! ```no_run
-//! #![feature(async_await, await_macro)]
+//! #![feature(async_await)]
 //!
 //! use runtime::net::UdpSocket;
 //!
@@ -28,8 +28,8 @@
 //!     println!("Listening on {}", socket.local_addr()?);
 //!
 //!     loop {
-//!         let (recv, peer) = await!(socket.recv_from(&mut buf))?;
-//!         let sent = await!(socket.send_to(&buf[..recv], &peer))?;
+//!         let (recv, peer) = socket.recv_from(&mut buf).await?;
+//!         let sent = socket.send_to(&buf[..recv], &peer).await?;
 //!         println!("Sent {} out of {} bytes to {}", sent, recv, peer);
 //!     }
 //! }
@@ -85,7 +85,7 @@
 //! - [Runtime Tokio](https://docs.rs/runtime-tokio) provides a thread pool, bindings to the OS, and
 //!   a work-stealing scheduler.
 
-#![feature(async_await, await_macro)]
+#![feature(async_await)]
 #![deny(unsafe_code)]
 #![warn(
     missing_debug_implementations,