Rollup merge of #43833 - dtolnay:connect-timeout, r=sfackler

GuillaumeGomez · web-flow · commit a7ead41aecfd · 2017-08-13T11:03:15.000+02:00
Fix TcpStream::connect_timeout tracking issue number Before: #43709 After: #43079 r? @sfackler
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
@@ -147,7 +147,7 @@ impl TcpStream {
     /// connection request.
     ///
     /// [`SocketAddr`]: ../../std/net/enum.SocketAddr.html
-    #[unstable(feature = "tcpstream_connect_timeout", issue = "43709")]
+    #[unstable(feature = "tcpstream_connect_timeout", issue = "43079")]
     pub fn connect_timeout(addr: &SocketAddr, timeout: Duration) -> io::Result<TcpStream> {
         net_imp::TcpStream::connect_timeout(addr, timeout).map(TcpStream)
     }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ impl TcpStream {`
`147`	`147`	`/// connection request.`
`148`	`148`	`///`
`149`	`149`	/// [`SocketAddr`]: ../../std/net/enum.SocketAddr.html
`150`		`- #[unstable(feature = "tcpstream_connect_timeout", issue = "43709")]`
	`150`	`+ #[unstable(feature = "tcpstream_connect_timeout", issue = "43079")]`
`151`	`151`	`pub fn connect_timeout(addr: &SocketAddr, timeout: Duration) -> io::Result<TcpStream> {`
`152`	`152`	`net_imp::TcpStream::connect_timeout(addr, timeout).map(TcpStream)`
`153`	`153`	`}`