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/chat.rs b/examples/chat.rs
index 76e689b9..667f0e9a 100644
--- a/examples/chat.rs
+++ b/examples/chat.rs
@@ -29,7 +29,7 @@ use std::io::{Error, ErrorKind, BufReader};
 use std::sync::{Arc, Mutex};
 
 use futures::Future;
-use futures::future::Executor;
+use futures::future::{self, Executor};
 use futures::stream::{self, Stream};
 use futures_cpupool::CpuPool;
 use tokio::net::TcpListener;
@@ -134,5 +134,5 @@ fn main() {
     });
 
     // execute server
-    srv.wait().unwrap();
+    future::blocking(srv).wait().unwrap();
 }