Track futures tokio-reform branch (#88)

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

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/echo.rs b/examples/echo.rs
index 558f3a68..54a28ff7 100644
--- a/examples/echo.rs
+++ b/examples/echo.rs
@@ -26,7 +26,7 @@ use std::env;
 use std::net::SocketAddr;
 
 use futures::Future;
-use futures::future::Executor;
+use futures::future::{self, Executor};
 use futures::stream::Stream;
 use futures_cpupool::CpuPool;
 use tokio_io::AsyncRead;
@@ -114,5 +114,5 @@ fn main() {
     // And finally now that we've define what our server is, we run it! Here we
     // just need to execute the future we've created and wait for it to complete
     // using the standard methods in the `futures` crate.
-    done.wait().unwrap();
+    future::blocking(done).wait().unwrap();
 }