Track futures tokio-reform branch (#88)

This patch also updates tests and examples to remove deprecated API
usage.

1 files changed, 2 insertions, 3 deletions

diff --git a/examples/tinyhttp.rs b/examples/tinyhttp.rs
index 00c16fec..b0106d63 100644
--- a/examples/tinyhttp.rs
+++ b/examples/tinyhttp.rs
@@ -31,8 +31,7 @@ use std::net::{self, SocketAddr};
 use std::thread;
 
 use bytes::BytesMut;
-use futures::future::Executor;
-use futures::future;
+use futures::future::{self, Executor};
 use futures::sync::mpsc;
 use futures::{Stream, Future, Sink};
 use futures_cpupool::CpuPool;
@@ -91,7 +90,7 @@ fn worker(rx: mpsc::UnboundedReceiver<net::TcpStream>) {
         })).unwrap();
         Ok(())
     });
-    done.wait().unwrap();
+    future::blocking(done).wait().unwrap();
 }
 
 /// "Server logic" is implemented in this function.