Expand docs of multi-address behavior of some UDP/TCP APIs. #44209

frewsxcv · 2017-08-31T04:15:12Z

rust-highfive · 2017-08-31T04:15:24Z

(rust_highfive has picked a reviewer for you, use r? to override)

kennytm · 2017-08-31T06:46:38Z

src/libstd/net/tcp.rs

+    /// a TCP connection to `127.0.0.1:8081`:
+    ///
+    /// ```no_run
+    /// use std::net::TcpStream;


The doc tests failed, SocketAddr needs to be imported first.

[00:57:39] failures: [00:57:39] [00:57:39] ---- net/tcp.rs - net::tcp::TcpListener::bind (line 602) stdout ---- [00:57:39] error[E0433]: failed to resolve. Use of undeclared type or module `SocketAddr` [00:57:39] --> net/tcp.rs:7:5 [00:57:39] | [00:57:39] 7 | SocketAddr::from(([127, 0, 0, 1], 80)), [00:57:39] | ^^^^^^^^^^ Use of undeclared type or module `SocketAddr` [00:57:39] [00:57:39] error[E0433]: failed to resolve. Use of undeclared type or module `SocketAddr` [00:57:39] --> net/tcp.rs:8:5 [00:57:39] | [00:57:39] 8 | SocketAddr::from(([127, 0, 0, 1], 443)), [00:57:39] | ^^^^^^^^^^ Use of undeclared type or module `SocketAddr` [00:57:39] [00:57:39] thread 'rustc' panicked at 'couldn't compile the test', /checkout/src/librustdoc/test.rs:280:12 [00:57:39] note: Run with `RUST_BACKTRACE=1` for a backtrace. [00:57:39] [00:57:39] ---- net/tcp.rs - net::tcp::TcpStream::connect (line 140) stdout ---- [00:57:39] error[E0433]: failed to resolve. Use of undeclared type or module `SocketAddr` [00:57:39] --> net/tcp.rs:7:5 [00:57:39] | [00:57:39] 7 | SocketAddr::from(([127, 0, 0, 1], 8080)), [00:57:39] | ^^^^^^^^^^ Use of undeclared type or module `SocketAddr` [00:57:39] [00:57:39] error[E0433]: failed to resolve. Use of undeclared type or module `SocketAddr` [00:57:39] --> net/tcp.rs:8:5 [00:57:39] | [00:57:39] 8 | SocketAddr::from(([127, 0, 0, 1], 8081)), [00:57:39] | ^^^^^^^^^^ Use of undeclared type or module `SocketAddr` [00:57:39] [00:57:39] thread 'rustc' panicked at 'couldn't compile the test', /checkout/src/librustdoc/test.rs:280:12 [00:57:39] [00:57:39] [00:57:39] failures: [00:57:39] net/tcp.rs - net::tcp::TcpListener::bind (line 602) [00:57:39] net/tcp.rs - net::tcp::TcpStream::connect (line 140)

kennytm · 2017-08-31T06:46:48Z

src/libstd/net/tcp.rs

+    /// TCP listener bound to `127.0.0.1:443`:
+    ///
+    /// ```no_run
+    /// use std::net::TcpListener;


frewsxcv · 2017-08-31T13:20:57Z

Imports fixed in the latest force push.

alexcrichton · 2017-08-31T14:13:20Z

@bors: r+

bors · 2017-08-31T14:13:21Z

📌 Commit c548e51 has been approved by alexcrichton

frewsxcv · 2017-08-31T14:24:19Z

@bors rollup

Fixes rust-lang#22569.

frewsxcv · 2017-08-31T15:24:56Z

fixed another import issue

@bors r=alexcrichton

diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 2fb5d2b0ac..5467eff202 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -599,7 +599,7 @@ impl TcpListener {
     /// TCP listener bound to `127.0.0.1:443`:
     ///
     /// ```no_run
-    /// use std::net::{SocketAddr, TcpStream};
+    /// use std::net::{SocketAddr, TcpListener};
     ///
     /// let addrs = [
     ///     SocketAddr::from(([127, 0, 0, 1], 80)),

bors · 2017-08-31T15:24:57Z

📌 Commit 0a716fd has been approved by alexcrichton

…ios, r=alexcrichton Expand docs of multi-address behavior of some UDP/TCP APIs. Fixes rust-lang#22569.

Rollup of 10 pull requests - Successful merges: #44192, #44199, #44202, #44203, #44205, #44207, #44209, #44223, #44230, #44231 - Failed merges:

bors · 2017-09-01T07:32:59Z

☔ The latest upstream changes (presumably #44233) made this pull request unmergeable. Please resolve the merge conflicts.

@frewsxcv