diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2017-08-13 11:03:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-13 11:03:15 +0200 |
| commit | a7ead41aecfdd591bbb552eb007708be2c0919de (patch) | |
| tree | abe73ac7c83f202a58f0a8d16e2c19a9f8a7b7ba /src | |
| parent | 09ac9fd2723231c916855ca596ee7408b732cbc5 (diff) | |
| parent | aea61e6005dabf3a5c85dbb4fda33544c7808f16 (diff) | |
| download | rust-a7ead41aecfdd591bbb552eb007708be2c0919de.tar.gz rust-a7ead41aecfdd591bbb552eb007708be2c0919de.zip | |
Rollup merge of #43833 - dtolnay:connect-timeout, r=sfackler
Fix TcpStream::connect_timeout tracking issue number Before: https://github.com/rust-lang/rust/pull/43709 After: https://github.com/rust-lang/rust/issues/43079 r? @sfackler
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstd/net/tcp.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index 20fd50ff630..2eabb46441b 100644 --- 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) } |