From 315f6018229f38b34107096924e6f09a52527cac Mon Sep 17 00:00:00 2001
From: oberien <jaro.fietz@gmx.de>
Date: Tue, 11 Oct 2016 20:08:13 +0200
Subject: [PATCH] ref(examples): Minor refactoring in chat example

* Move connections-clone down a bit
* Use `Ok` and `Err` as IntoFuture
---
 examples/chat.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/chat.rs b/examples/chat.rs
index 91f8c47b0..18a09d8a7 100644
--- a/examples/chat.rs
+++ b/examples/chat.rs
@@ -49,7 +49,6 @@ fn main() {
             let iter = stream::iter::<_, _, std::io::Error>(iter::repeat(()).map(Ok));
             // Then we fold it as infinite loop
             let socket_reader = iter.fold(reader, move |reader, _| {
-                let connections = connections_inner.clone();
                 // read line
                 let amt = io::read_until(reader, '\n' as u8, vec![]);
                 // check if we hit EOF and need to close the connection
@@ -57,13 +56,14 @@ fn main() {
                     // EOF was hit without reading a delimiter
                     if vec.len() == 0 {
                         let err = Error::new(ErrorKind::BrokenPipe, "Broken Pipe");
-                        futures::failed(err).boxed()
+                        Err(err)
                     } else {
-                        futures::finished((reader, vec)).boxed()
+                        Ok((reader, vec))
                     }
                 });
                 // convert bytes into string
                 let amt = amt.map(|(reader, vec)| (reader, String::from_utf8(vec)));
+                let connections = connections_inner.clone();
                 amt.map(move |(reader, message)| {
                     println!("{}: {:?}", addr, message);
                     let conns = connections.borrow_mut();