diff options
| author | bors <bors@rust-lang.org> | 2015-09-13 19:45:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-13 19:45:15 +0000 |
| commit | cedbd998a4669e026b2a1b34de95d91cd0fde1a5 (patch) | |
| tree | c201a78235b82e78e92cd4f5b51d7022ffddfea6 /src/libstd/sys/windows | |
| parent | c494cf1d01befbc85247a4bb82c3d15cadcfedeb (diff) | |
| parent | f0b1326dc79e186f89b65336ae85f3a8ac6db4c1 (diff) | |
| download | rust-cedbd998a4669e026b2a1b34de95d91cd0fde1a5.tar.gz rust-cedbd998a4669e026b2a1b34de95d91cd0fde1a5.zip | |
Auto merge of #28339 - alexcrichton:stabilize-1.4, r=aturon
The FCP is coming to a close and 1.4 is coming out soon, so this brings in the libs team decision for all library features this cycle. Stabilized APIs: * `<Box<str>>::into_string` * `Arc::downgrade` * `Arc::get_mut` * `Arc::make_mut` * `Arc::try_unwrap` * `Box::from_raw` * `Box::into_raw` * `CStr::to_str` * `CStr::to_string_lossy` * `CString::from_raw` * `CString::into_raw` * `IntoRawFd::into_raw_fd` * `IntoRawFd` * `IntoRawHandle::into_raw_handle` * `IntoRawHandle` * `IntoRawSocket::into_raw_socket` * `IntoRawSocket` * `Rc::downgrade` * `Rc::get_mut` * `Rc::make_mut` * `Rc::try_unwrap` * `Result::expect` * `String::into_boxed_slice` * `TcpSocket::read_timeout` * `TcpSocket::set_read_timeout` * `TcpSocket::set_write_timeout` * `TcpSocket::write_timeout` * `UdpSocket::read_timeout` * `UdpSocket::set_read_timeout` * `UdpSocket::set_write_timeout` * `UdpSocket::write_timeout` * `Vec::append` * `Vec::split_off` * `VecDeque::append` * `VecDeque::retain` * `VecDeque::split_off` * `rc::Weak::upgrade` * `rc::Weak` * `slice::Iter::as_slice` * `slice::IterMut::into_slice` * `str::CharIndices::as_str` * `str::Chars::as_str` * `str::split_at_mut` * `str::split_at` * `sync::Weak::upgrade` * `sync::Weak` * `thread::park_timeout` * `thread::sleep` Deprecated APIs * `BTreeMap::with_b` * `BTreeSet::with_b` * `Option::as_mut_slice` * `Option::as_slice` * `Result::as_mut_slice` * `Result::as_slice` * `f32::from_str_radix` * `f64::from_str_radix` Closes #27277 Closes #27718 Closes #27736 Closes #27764 Closes #27765 Closes #27766 Closes #27767 Closes #27768 Closes #27769 Closes #27771 Closes #27773 Closes #27775 Closes #27776 Closes #27785 Closes #27792 Closes #27795 Closes #27797
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/ext/io.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/libstd/sys/windows/ext/io.rs b/src/libstd/sys/windows/ext/io.rs index a203a23068e..9f10b0e8563 100644 --- a/src/libstd/sys/windows/ext/io.rs +++ b/src/libstd/sys/windows/ext/io.rs @@ -52,14 +52,14 @@ pub trait FromRawHandle { /// A trait to express the ability to consume an object and acquire ownership of /// its raw `HANDLE`. -#[unstable(feature = "into_raw_os", reason = "recently added API", - issue = "27797")] +#[stable(feature = "into_raw_os", since = "1.4.0")] pub trait IntoRawHandle { /// Consumes this object, returning the raw underlying handle. /// /// This function **transfers ownership** of the underlying handle to the /// caller. Callers are then the unique owners of the handle and must close /// it once it's no longer needed. + #[stable(feature = "into_raw_os", since = "1.4.0")] fn into_raw_handle(self) -> RawHandle; } @@ -78,6 +78,7 @@ impl FromRawHandle for fs::File { } } +#[stable(feature = "into_raw_os", since = "1.4.0")] impl IntoRawHandle for fs::File { fn into_raw_handle(self) -> RawHandle { self.into_inner().into_handle().into_raw() as *mut _ @@ -111,14 +112,14 @@ pub trait FromRawSocket { /// A trait to express the ability to consume an object and acquire ownership of /// its raw `SOCKET`. -#[unstable(feature = "into_raw_os", reason = "recently added API", - issue = "27797")] +#[stable(feature = "into_raw_os", since = "1.4.0")] pub trait IntoRawSocket { /// Consumes this object, returning the raw underlying socket. /// /// This function **transfers ownership** of the underlying socket to the /// caller. Callers are then the unique owners of the socket and must close /// it once it's no longer needed. + #[stable(feature = "into_raw_os", since = "1.4.0")] fn into_raw_socket(self) -> RawSocket; } @@ -163,18 +164,21 @@ impl FromRawSocket for net::UdpSocket { } } +#[stable(feature = "into_raw_os", since = "1.4.0")] impl IntoRawSocket for net::TcpStream { fn into_raw_socket(self) -> RawSocket { self.into_inner().into_socket().into_inner() } } +#[stable(feature = "into_raw_os", since = "1.4.0")] impl IntoRawSocket for net::TcpListener { fn into_raw_socket(self) -> RawSocket { self.into_inner().into_socket().into_inner() } } +#[stable(feature = "into_raw_os", since = "1.4.0")] impl IntoRawSocket for net::UdpSocket { fn into_raw_socket(self) -> RawSocket { self.into_inner().into_socket().into_inner() |
