diff --git a/Cargo.toml b/Cargo.toml index dbc790d7f..9dccecc72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ scoped-tls = "0.1.0" slab = "0.3" iovec = "0.1" tokio-io = "0.1" -futures = "0.1.14" +futures = "0.1.15" [dev-dependencies] env_logger = { version = "0.4", default-features = false } diff --git a/examples/chat.rs b/examples/chat.rs index 267e0aa63..0e05c8ad4 100644 --- a/examples/chat.rs +++ b/examples/chat.rs @@ -68,7 +68,7 @@ fn main() { // Model the read portion of this socket by mapping an infinite // iterator to each line off the socket. This "loop" is then // terminated with an error once we hit EOF on the socket. - let iter = stream::iter(iter::repeat(()).map(Ok::<(), Error>)); + let iter = stream::iter_ok::<_, Error>(iter::repeat(())); let socket_reader = iter.fold(reader, move |reader, _| { // Read a line off the socket, failing if we're at EOF let line = io::read_until(reader, b'\n', Vec::new()); @@ -96,11 +96,11 @@ fn main() { .filter(|&(&k, _)| k != addr) .map(|(_, v)| v); for tx in iter { - tx.send(format!("{}: {}", addr, msg)).unwrap(); + tx.unbounded_send(format!("{}: {}", addr, msg)).unwrap(); } } else { let tx = conns.get_mut(&addr).unwrap(); - tx.send("You didn't send valid UTF-8.".to_string()).unwrap(); + tx.unbounded_send("You didn't send valid UTF-8.".to_string()).unwrap(); } reader }) diff --git a/examples/sink.rs b/examples/sink.rs index 2998b269f..bd56001f9 100644 --- a/examples/sink.rs +++ b/examples/sink.rs @@ -50,8 +50,8 @@ fn main() { fn write(socket: TcpStream) -> IoFuture<()> { static BUF: &'static [u8] = &[0; 64 * 1024]; - let iter = iter::repeat(()).map(|()| Ok(())); - stream::iter(iter).fold(socket, |socket, ()| { + let iter = iter::repeat(()); + Box::new(stream::iter_ok(iter).fold(socket, |socket, ()| { tokio_io::io::write_all(socket, BUF).map(|(socket, _)| socket) - }).map(|_| ()).boxed() + }).map(|_| ())) } diff --git a/src/io/mod.rs b/src/io/mod.rs index f0c50e31e..5fa11206a 100644 --- a/src/io/mod.rs +++ b/src/io/mod.rs @@ -10,6 +10,7 @@ //! [low level details]: https://tokio.rs/docs/going-deeper-tokio/core-low-level/ #![deprecated(note = "moved to the `tokio-io` crate")] +#![allow(deprecated)] use std::io; diff --git a/src/net/tcp.rs b/src/net/tcp.rs index ee65f06b6..3e5214378 100644 --- a/src/net/tcp.rs +++ b/src/net/tcp.rs @@ -308,7 +308,7 @@ impl TcpStream { Ok(tcp) => TcpStream::new(tcp, handle), Err(e) => TcpStreamNewState::Error(e), }; - state.boxed() + Box::new(state) } /// Test whether this socket is ready to be read or not. diff --git a/src/reactor/mod.rs b/src/reactor/mod.rs index 1caa95763..18bd2b3c7 100644 --- a/src/reactor/mod.rs +++ b/src/reactor/mod.rs @@ -583,7 +583,7 @@ impl Remote { lp.notify(msg); } None => { - match mpsc::UnboundedSender::send(&self.tx, msg) { + match self.tx.unbounded_send(msg) { Ok(()) => {} // TODO: this error should punt upwards and we should