diff options
| author | David Tolnay <dtolnay@gmail.com> | 2017-09-24 22:23:26 -0700 |
|---|---|---|
| committer | David Tolnay <dtolnay@gmail.com> | 2017-09-24 22:27:39 -0700 |
| commit | 874124b2c73dc764aa83f7ba9711a4170c0aeffc (patch) | |
| tree | 84495028597a1c6d1e7b62f842a7a8069806cbf0 /src/libstd | |
| parent | 7a9cdc4c2a98c3a889604762dccd463757079798 (diff) | |
| download | rust-874124b2c73dc764aa83f7ba9711a4170c0aeffc.tar.gz rust-874124b2c73dc764aa83f7ba9711a4170c0aeffc.zip | |
Backport libs stabilizations to 1.21 beta
This includes the following stabilizations: - tcpstream_connect_timeout https://github.com/rust-lang/rust/pull/44563 - iterator_for_each https://github.com/rust-lang/rust/pull/44567 - ord_max_min https://github.com/rust-lang/rust/pull/44593 - compiler_fences https://github.com/rust-lang/rust/pull/44595 - needs_drop https://github.com/rust-lang/rust/pull/44639 - vec_splice https://github.com/rust-lang/rust/pull/44640
Diffstat (limited to 'src/libstd')
| -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 aff9af66444..8d1e7882e5d 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 - #[stable(feature = "tcpstream_connect_timeout", since = "1.22.0")] + #[stable(feature = "tcpstream_connect_timeout", since = "1.21.0")] pub fn connect_timeout(addr: &SocketAddr, timeout: Duration) -> io::Result<TcpStream> { net_imp::TcpStream::connect_timeout(addr, timeout).map(TcpStream) } |