mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Guillaume Gomez 2017-08-13 11:03:15 +02:00 committed by GitHub
commit a7ead41aec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstd/net/tcp.rs
View File

@ -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)
}