Rollup merge of rust-lang#44563 - budziq:stablilize_tcpstream_connect_timeout, r=alexcrichton

frewsxcv · web-flow · commit 4af8acd6c17b · 2017-09-14T22:32:50.000-04:00
stabilize tcpstream_connect_timeout (closes rust-lang#43079)
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
@@ -167,7 +167,7 @@ impl TcpStream {
     /// connection request.
     ///
     /// [`SocketAddr`]: ../../std/net/enum.SocketAddr.html
-    #[unstable(feature = "tcpstream_connect_timeout", issue = "43079")]
+    #[stable(feature = "tcpstream_connect_timeout", since = "1.22.0")]
     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
`@@ -167,7 +167,7 @@ impl TcpStream {`
`167`	`167`	`/// connection request.`
`168`	`168`	`///`
`169`	`169`	/// [`SocketAddr`]: ../../std/net/enum.SocketAddr.html
`170`		`- #[unstable(feature = "tcpstream_connect_timeout", issue = "43079")]`
	`170`	`+ #[stable(feature = "tcpstream_connect_timeout", since = "1.22.0")]`
`171`	`171`	`pub fn connect_timeout(addr: &SocketAddr, timeout: Duration) -> io::Result<TcpStream> {`
`172`	`172`	`net_imp::TcpStream::connect_timeout(addr, timeout).map(TcpStream)`
`173`	`173`	`}`