summaryrefslogtreecommitdiffstats
path: root/examples/proxy.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-12-12 18:32:50 -0600
committerCarl Lerche <me@carllerche.com>2017-12-12 18:32:50 -0600
commit4ef772b2db9fdf19625e428f1031409994b4c8e6 (patch)
tree35d3bd529eedbab426130edde1c9dbc71ff5d80f /examples/proxy.rs
parent849771ecfa1e22fdd4f0bd299d10f0026ce14ed5 (diff)
Remove `Handle` argument from I/O constructors (#61)
This commit removes the `Handle` argument from the following constructors * `TcpListener::bind` * `TcpStream::connect` * `UdpSocket::bind` The `Handle` argument remains on the various `*_std` constructors as they're more low-level, but this otherwise is intended to set forth a precedent of by default not taking `Handle` arguments and instead relying on the global `Handle::default` return value when necesary.
Diffstat (limited to 'examples/proxy.rs')
-rw-r--r--examples/proxy.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/examples/proxy.rs b/examples/proxy.rs
index 03a83204..c64ead6f 100644
--- a/examples/proxy.rs
+++ b/examples/proxy.rs
@@ -31,7 +31,6 @@ use futures::{Future, Poll};
use futures::future::Executor;
use futures_cpupool::CpuPool;
use tokio::net::{TcpListener, TcpStream};
-use tokio::reactor::Handle;
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_io::io::{copy, shutdown};
@@ -42,17 +41,15 @@ fn main() {
let server_addr = env::args().nth(2).unwrap_or("127.0.0.1:8080".to_string());
let server_addr = server_addr.parse::<SocketAddr>().unwrap();
- let handle = Handle::default();
-
let pool = CpuPool::new(1);
// Create a TCP listener which will listen for incoming connections.
- let socket = TcpListener::bind(&listen_addr, &handle).unwrap();
+ let socket = TcpListener::bind(&listen_addr).unwrap();
println!("Listening on: {}", listen_addr);
println!("Proxying to: {}", server_addr);
let done = socket.incoming().for_each(move |(client, client_addr)| {
- let server = TcpStream::connect(&server_addr, &handle);
+ let server = TcpStream::connect(&server_addr);
let amounts = server.and_then(move |server| {
// Create separate read/write handles for the TCP clients that we're
// proxying data between. Note that typically you'd use