]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #44563 - budziq:stablilize_tcpstream_connect_timeout, r=alexcrichton
authorCorey Farwell <coreyf@rwell.org>
Fri, 15 Sep 2017 02:32:50 +0000 (22:32 -0400)
committerGitHub <noreply@github.com>
Fri, 15 Sep 2017 02:32:50 +0000 (22:32 -0400)
stabilize tcpstream_connect_timeout (closes #43079)

src/libstd/net/tcp.rs

index 5467eff202b02847cd45ca92966ffbd7ce6df08e..943a83a95fb2333eba161c9e8fed1be74c391a04 100644 (file)
@@ -167,7 +167,7 @@ pub fn connect<A: ToSocketAddrs>(addr: A) -> io::Result<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)
     }