From ab1e2b403a8a45a92d889aed4acc6d6493496c37 Mon Sep 17 00:00:00 2001
From: Stjepan Glavina <stjepang@gmail.com>
Date: Wed, 11 Sep 2019 17:17:20 +0200
Subject: [PATCH 1/2] Fix compilation errors on latest nightly

---
 docs/src/tutorial/all_together.md                   | 3 ++-
 docs/src/tutorial/clean_shutdown.md                 | 6 ++++--
 docs/src/tutorial/connecting_readers_and_writers.md | 3 ++-
 docs/src/tutorial/handling_disconnection.md         | 3 ++-
 examples/a-chat/server.rs                           | 5 ++---
 examples/socket-timeouts.rs                         | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/src/tutorial/all_together.md b/docs/src/tutorial/all_together.md
index a638e02c0..641c7da72 100644
--- 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
index f61adf2e3..992a35d95 100644
--- 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
index 7399cec10..d5da471ab 100644
--- 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
index 351f2533f..82bbef5a6 100644
--- 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
index 911d16073..77ebfd1e3 100644
--- 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
index b2f770e95..894206c69 100644
--- 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)
     })

From 0f4f0fb77e1bee5b51409f0d25312a1581cb6339 Mon Sep 17 00:00:00 2001
From: Stjepan Glavina <stjepang@gmail.com>
Date: Wed, 11 Sep 2019 17:29:33 +0200
Subject: [PATCH 2/2] Fix a typo

---
 docs/src/tutorial/handling_disconnection.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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