about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-04-27 19:59:15 -0400
committerGitHub <noreply@github.com>2017-04-27 19:59:15 -0400
commit095936c2095742140d3b7f69992fc776b74135ab (patch)
tree2931cffef177386330c9e7181f50fe0164d8f8be /src/libstd
parent9a9420e6577d94e8e52e7bcaaedf295984125c5b (diff)
parent7b7fe9b5c1609873830707b076d30f2a1e278d11 (diff)
downloadrust-095936c2095742140d3b7f69992fc776b74135ab.tar.gz
rust-095936c2095742140d3b7f69992fc776b74135ab.zip
Rollup merge of #41526 - steveklabnik:gh35950, r=GuillaumeGomez
Clean up TcpStream example

Fixes #35950
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net/tcp.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 8def11295fd..34229f80769 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -72,24 +72,23 @@ pub struct TcpStream(net_imp::TcpStream);
 ///
 /// # Examples
 ///
-/// ```no_run
+/// ```
+/// # use std::io;
 /// use std::net::{TcpListener, TcpStream};
 ///
-/// let listener = TcpListener::bind("127.0.0.1:80").unwrap();
-///
 /// fn handle_client(stream: TcpStream) {
 ///     // ...
 /// }
 ///
+/// # fn process() -> io::Result<()> {
+/// let listener = TcpListener::bind("127.0.0.1:80").unwrap();
+///
 /// // accept connections and process them serially
 /// for stream in listener.incoming() {
-///     match stream {
-///         Ok(stream) => {
-///             handle_client(stream);
-///         }
-///         Err(e) => { /* connection failed */ }
-///     }
+///     handle_client(stream?);
 /// }
+/// # Ok(())
+/// # }
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct TcpListener(net_imp::TcpListener);