Skip to content

Commit

Permalink
Rollup merge of rust-lang#44563 - budziq:stablilize_tcpstream_connect…
Browse files Browse the repository at this point in the history
…_timeout, r=alexcrichton

stabilize tcpstream_connect_timeout (closes rust-lang#43079)
  • Loading branch information
frewsxcv authored Sep 15, 2017
2 parents 19ad12a + 199cb82 commit 4af8acd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/net/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit 4af8acd

Please sign in to comment.