about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-09-14 22:32:50 -0400
committerGitHub <noreply@github.com>2017-09-14 22:32:50 -0400
commit4af8acd6c17b257c0782dbdd4010f3006e4bcfad (patch)
tree4cb2d9088852cdc2c27ef52dd2bc632eb0b2ea11
parent19ad12af652d315c4084d4c6874dee9d49a17c6c (diff)
parent199cb82597f4ccd8bc761024ae694d61975ce94e (diff)
downloadrust-4af8acd6c17b257c0782dbdd4010f3006e4bcfad.tar.gz
rust-4af8acd6c17b257c0782dbdd4010f3006e4bcfad.zip
Rollup merge of #44563 - budziq:stablilize_tcpstream_connect_timeout, r=alexcrichton
stabilize tcpstream_connect_timeout (closes #43079)
-rw-r--r--src/libstd/net/tcp.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 5467eff202b..943a83a95fb 100644
--- 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)
     }