summaryrefslogtreecommitdiffstats
path: root/examples/proxy.rs
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2018-02-06 07:26:21 -0800
committerGitHub <noreply@github.com>2018-02-06 07:26:21 -0800
commitf0ea9d6f4c0a734ac4c235630f3d8cc51fb48f51 (patch)
tree011aae238269ce6ba1cf29013126e4e45fea4cd4 /examples/proxy.rs
parent567887cc75170437f75f19f5966f2b32bf49ab72 (diff)
Switch back to futures from crates.io (#113)
Doing so requires copying the `current_thread` executor from GitHub into the repo.
Diffstat (limited to 'examples/proxy.rs')
-rw-r--r--examples/proxy.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/proxy.rs b/examples/proxy.rs
index f73dd30d..131fa41b 100644
--- a/examples/proxy.rs
+++ b/examples/proxy.rs
@@ -28,7 +28,7 @@ use std::io::{self, Read, Write};
use futures::stream::Stream;
use futures::{Future, Poll};
-use futures::future::{self, Executor};
+use futures::future::{Executor};
use futures_cpupool::CpuPool;
use tokio::net::{TcpListener, TcpStream};
use tokio_io::{AsyncRead, AsyncWrite};
@@ -92,7 +92,8 @@ fn main() {
Ok(())
});
- future::blocking(done).wait().unwrap();
+
+ done.wait().unwrap();
}
// This is a custom type used to have a custom implementation of the