diff options
130 files changed, 1655 insertions, 1686 deletions
diff --git a/examples/chat.rs b/examples/chat.rs index e0213afd..2553cc5e 100644 --- a/examples/chat.rs +++ b/examples/chat.rs @@ -116,18 +116,12 @@ impl Shared { /// Send a `LineCodec` encoded message to every peer, except /// for the sender. - async fn broadcast( - &mut self, - sender: SocketAddr, - message: &str, - ) -> Result<(), mpsc::error::UnboundedSendError> { + async fn broadcast(&mut self, sender: SocketAddr, message: &str) { for peer in self.peers.iter_mut() { if *peer.0 != sender { - peer.1.send(message.into()).await?; + let _ = peer.1.send(message.into()); } } - - Ok(()) } } @@ -218,7 +212,7 @@ async fn process( let mut state = state.lock().await; let msg = format!("{} has joined the chat", username); println!("{}", msg); - state.broadcast(addr, &msg).await?; + state.broadcast(addr, &msg).await; } // Process incoming messages until our stream is exhausted by a disconnect. @@ -230,7 +224,7 @@ async fn process( let mut state = state.lock().await; let msg = format!("{}: {}", username, msg); - state.broadcast(addr, &msg).await?; + state.broadcast(addr, &msg).await; } // A message was received from a peer. Send it to the // current user. @@ -254,7 +248,7 @@ async fn process( let msg = format!("{} has left the chat", username); println!("{}", msg); - state.broadcast(addr, &msg).await?; + state.broadcast(addr, &msg).await; } Ok(()) diff --git a/examples/connect.rs b/examples/connect.rs index 38d81229..cb003d9d 100644 --- a/examples/connect.rs +++ b/examples/connect.rs @@ -20,7 +20,7 @@ use tokio::io; use tokio::sync::{mpsc, oneshot}; use tokio_util::codec::{FramedRead, FramedWrite}; -use futures::{SinkExt, Stream, StreamExt}; +use futures::{Stream, StreamExt}; use std::env; use std::error::Error; use std::net::SocketAddr; @@ -69,12 +69,14 @@ async fn run() -> Result<(), Box<dyn Error>> { // Temporary work around for stdin blocking the stream fn stdin() -> impl Stream<Item = Result<Vec<u8>, io::Error>> + Unpin { - let mut stdin = FramedRead::new(io::stdin(), codec::Bytes).map(Ok); + let mut stdin = FramedRead::new(io::stdin(), codec::Bytes); - let (mut tx, rx) = mpsc::unbounded_channel(); + let (tx, rx) = mpsc::unbounded_channel(); tokio::spawn(async move { - tx.send_all(&mut stdin).await.unwrap(); + while let Some(res) = stdin.next().await { + let _ = tx.send(res); + } }); rx diff --git a/examples/print_each_packet.rs b/examples/print_each_packet.rs index 0a275545..f056db4a 100644 --- a/examples/print_each_packet.rs +++ b/examples/print_each_packet.rs @@ -55,9 +55,9 @@ #![warn(rust_2018_idioms)] use tokio::net::TcpListener; -use tokio::prelude::*; use tokio_util::codec::{BytesCodec, Decoder}; +use futures::StreamExt; use std::env; #[tokio::main] diff --git a/examples/proxy.rs b/examples/proxy.rs index 6886a813..4314d1b9 100644 --- a/examples/proxy.rs +++ b/examples/proxy.rs @@ -22,7 +22,7 @@ #![warn(rust_2018_idioms)] -use futures::{future::try_join, FutureExt, StreamExt}; +use futures::{future::try_join, FutureExt}; use std::{env, error::Error}; use tokio::{ io::AsyncReadExt, @@ -37,9 +37,9 @@ async |