Merge #182

182: Fix compilation errors on latest nightly r=stjepang a=stjepang Co-authored-by: Stjepan Glavina <stjepang@gmail.com>
async-rs · Sep 11, 2019 · 8d2ae35 · 8d2ae35
2 parents 06f2569 + ab1e2b4
commit 8d2ae35
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/docs/src/tutorial/all_together.md b/docs/src/tutorial/all_together.md
@@ -115,7 +115,8 @@ async fn broker(mut events: Receiver<Event>) -> Result<()> {
             Event::Message { from, to, msg } => {
                 for addr in to {
                     if let Some(peer) = peers.get_mut(&addr) {
-                        peer.send(format!("from {}: {}\n", from, msg)).await?
+                        let msg = format!("from {}: {}\n", from, msg);
+                        peer.send(msg).await?
                     }
                 }
             }

diff --git a/docs/src/tutorial/clean_shutdown.md b/docs/src/tutorial/clean_shutdown.md
@@ -115,7 +115,8 @@ Let's add waiting to the server:
 #             Event::Message { from, to, msg } => {
 #                 for addr in to {
 #                     if let Some(peer) = peers.get_mut(&addr) {
-#                         peer.send(format!("from {}: {}\n", from, msg)).await?
+#                         let msg = format!("from {}: {}\n", from, msg);
+#                         peer.send(msg).await?
 #                     }
 #                 }
 #             }
@@ -217,7 +218,8 @@ async fn broker(mut events: Receiver<Event>) -> Result<()> {
             Event::Message { from, to, msg } => {
                 for addr in to {
                     if let Some(peer) = peers.get_mut(&addr) {
-                        peer.send(format!("from {}: {}\n", from, msg)).await?
+                        let msg = format!("from {}: {}\n", from, msg);
+                        peer.send(msg).await?
                     }
                 }
             }

diff --git a/docs/src/tutorial/connecting_readers_and_writers.md b/docs/src/tutorial/connecting_readers_and_writers.md
@@ -73,7 +73,8 @@ async fn broker(mut events: Receiver<Event>) -> Result<()> {
             Event::Message { from, to, msg } => {  // 3
                 for addr in to {
                     if let Some(peer) = peers.get_mut(&addr) {
-                        peer.send(format!("from {}: {}\n", from, msg)).await?
+                        let msg = format!("from {}: {}\n", from, msg);
+                        peer.send(msg).await?
                     }
                 }
             }

diff --git a/docs/src/tutorial/handling_disconnection.md b/docs/src/tutorial/handling_disconnection.md
@@ -257,7 +257,8 @@ async fn broker(events: Receiver<Event>) {
             Event::Message { from, to, msg } => {
                 for addr in to {
                     if let Some(peer) = peers.get_mut(&addr) {
-                        peer.send(format!("from {}: {}\n", from, msg)).await
+                        let msg = format!("from {}: {}\n", from, msg);
+                        peer.send(fmt).await
                             .unwrap() // 6
                     }
                 }

diff --git a/examples/a-chat/server.rs b/examples/a-chat/server.rs
@@ -139,9 +139,8 @@ async fn broker_loop(mut events: Receiver<Event>) {
             Event::Message { from, to, msg } => {
                 for addr in to {
                     if let Some(peer) = peers.get_mut(&addr) {
-                        peer.send(format!("from {}: {}\n", from, msg))
-                            .await
-                            .unwrap()
+                        let msg = format!("from {}: {}\n", from, msg);
+                        peer.send(msg).await.unwrap();
                     }
                 }
             }

diff --git a/examples/socket-timeouts.rs b/examples/socket-timeouts.rs
@@ -10,7 +10,7 @@ async fn get() -> io::Result<Vec<u8>> {
 
     let mut buf = vec![];
 
-    io::timeout(Duration::from_secs(5), async {
+    io::timeout(Duration::from_secs(5), async move {
         stream.read_to_end(&mut buf).await?;
         Ok(buf)
     })