about summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-22 16:55:16 +0000
committerbors <bors@rust-lang.org>2017-01-22 16:55:16 +0000
commitb79081c2eb7fe789f428ffcd20f49549c7ca84ea (patch)
tree6312735bc66c44fcee2fb142fe73fad868af398c /src/libstd/net
parent9f705575452e04ce2d8cb88e5f5accdc4d54e650 (diff)
parent19724d34d2b223f940363cc07aa83a8a530f8093 (diff)
downloadrust-b79081c2eb7fe789f428ffcd20f49549c7ca84ea.tar.gz
rust-b79081c2eb7fe789f428ffcd20f49549c7ca84ea.zip
Auto merge of #38648 - utkarshkukreti:question-mark-in-libstd-documentation-examples, r=pnkfelix,steveklabnik,frewsxcvx
libstd: replace all `try!` with `?` in documentation examples

See #38644.

For the record, I used the following Perl one-liner and then manually fixed a couple of things it got wrong:

    $ perl -p -i -e 's#(///.*)try!\((.*)\)#$1$2?#' src/libstd/**/*.rs
Diffstat (limited to 'src/libstd/net')
-rw-r--r--src/libstd/net/mod.rs2
-rw-r--r--src/libstd/net/udp.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/net/mod.rs b/src/libstd/net/mod.rs
index cadf87f32b1..2b60fc38198 100644
--- a/src/libstd/net/mod.rs
+++ b/src/libstd/net/mod.rs
@@ -129,7 +129,7 @@ impl fmt::Debug for LookupHost {
 /// use std::net;
 ///
 /// # fn foo() -> std::io::Result<()> {
-/// for host in try!(net::lookup_host("rust-lang.org")) {
+/// for host in net::lookup_host("rust-lang.org")? {
 ///     println!("found address: {}", host);
 /// }
 /// # Ok(())
diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs
index a9a19aee5d1..492e57f6e44 100644
--- a/src/libstd/net/udp.rs
+++ b/src/libstd/net/udp.rs
@@ -28,16 +28,16 @@ use time::Duration;
 ///
 /// # fn foo() -> std::io::Result<()> {
 /// {
-///     let mut socket = try!(UdpSocket::bind("127.0.0.1:34254"));
+///     let mut socket = UdpSocket::bind("127.0.0.1:34254")?;
 ///
 ///     // read from the socket
 ///     let mut buf = [0; 10];
-///     let (amt, src) = try!(socket.recv_from(&mut buf));
+///     let (amt, src) = socket.recv_from(&mut buf)?;
 ///
 ///     // send a reply to the socket we received data from
 ///     let buf = &mut buf[..amt];
 ///     buf.reverse();
-///     try!(socket.send_to(buf, &src));
+///     socket.send_to(buf, &src)?;
 ///     # Ok(())
 /// } // the socket is closed here
 /// # }