From 4ef772b2db9fdf19625e428f1031409994b4c8e6 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 12 Dec 2017 18:32:50 -0600 Subject: 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. --- examples/proxy.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'examples/proxy.rs') 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::().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 -- cgit v1.2.3