From 4590828fb4ea28ab99eb79ab7c1bc717949203ac Mon Sep 17 00:00:00 2001 From: Martin Grigorov Date: Sat, 6 Sep 2025 08:36:41 +0300 Subject: [PATCH] stream: improve the the docs of `TcpListenerStream` (#7578) Signed-off-by: Martin Tzvetanov Grigorov --- tokio-stream/src/wrappers/tcp_listener.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tokio-stream/src/wrappers/tcp_listener.rs b/tokio-stream/src/wrappers/tcp_listener.rs index c463ef142..feb6405bc 100644 --- a/tokio-stream/src/wrappers/tcp_listener.rs +++ b/tokio-stream/src/wrappers/tcp_listener.rs @@ -18,12 +18,12 @@ use tokio::net::{TcpListener, TcpStream}; /// /// # #[tokio::main(flavor = "current_thread")] /// # async fn main() -> std::io::Result<()> { -/// let ipv4_listener = TcpListener::bind((Ipv6Addr::LOCALHOST, 8080)).await?; -/// let ipv6_listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 8080)).await?; +/// let ipv4_listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 8080)).await?; +/// let ipv6_listener = TcpListener::bind((Ipv6Addr::LOCALHOST, 8080)).await?; /// let ipv4_connections = TcpListenerStream::new(ipv4_listener); /// let ipv6_connections = TcpListenerStream::new(ipv6_listener); /// -/// let mut connections = ipv4_connections.chain(ipv6_connections); +/// let mut connections = ipv4_connections.merge(ipv6_connections); /// while let Some(tcp_stream) = connections.next().await { /// let stream = tcp_stream?; /// let peer_addr = stream.peer_addr()?;