diff options
| author | bors <bors@rust-lang.org> | 2024-07-15 10:57:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-15 10:57:49 +0000 |
| commit | d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee (patch) | |
| tree | bd23bcd2ad1cdb90b447fb16e6a4679dbda900d0 /library/std/src/os/windows/io/raw.rs | |
| parent | adeb79d3f523dfc11a8e9db64ddfc5f546f650bb (diff) | |
| parent | 476d399782a27df846e1ace578a2e89f70a13d42 (diff) | |
| download | rust-d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee.tar.gz rust-d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee.zip | |
Auto merge of #127757 - workingjubilee:rollup-4dbks5r, r=workingjubilee
Rollup of 3 pull requests Successful merges: - #127712 (Windows: Remove some unnecessary type aliases) - #127744 (std: `#![deny(unsafe_op_in_unsafe_fn)]` in platform-independent code) - #127750 (Make os/windows and pal/windows default to `#![deny(unsafe_op_in_unsafe_fn)]`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/os/windows/io/raw.rs')
| -rw-r--r-- | library/std/src/os/windows/io/raw.rs | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/library/std/src/os/windows/io/raw.rs b/library/std/src/os/windows/io/raw.rs index 770583a9ce3..343cc6e4a8a 100644 --- a/library/std/src/os/windows/io/raw.rs +++ b/library/std/src/os/windows/io/raw.rs @@ -159,10 +159,12 @@ fn stdio_handle(raw: RawHandle) -> RawHandle { impl FromRawHandle for fs::File { #[inline] unsafe fn from_raw_handle(handle: RawHandle) -> fs::File { - let handle = handle as sys::c::HANDLE; - fs::File::from_inner(sys::fs::File::from_inner(FromInner::from_inner( - OwnedHandle::from_raw_handle(handle), - ))) + unsafe { + let handle = handle as sys::c::HANDLE; + fs::File::from_inner(sys::fs::File::from_inner(FromInner::from_inner( + OwnedHandle::from_raw_handle(handle), + ))) + } } } @@ -260,24 +262,30 @@ impl AsRawSocket for net::UdpSocket { impl FromRawSocket for net::TcpStream { #[inline] unsafe fn from_raw_socket(sock: RawSocket) -> net::TcpStream { - let sock = sys::net::Socket::from_inner(OwnedSocket::from_raw_socket(sock)); - net::TcpStream::from_inner(sys_common::net::TcpStream::from_inner(sock)) + unsafe { + let sock = sys::net::Socket::from_inner(OwnedSocket::from_raw_socket(sock)); + net::TcpStream::from_inner(sys_common::net::TcpStream::from_inner(sock)) + } } } #[stable(feature = "from_raw_os", since = "1.1.0")] impl FromRawSocket for net::TcpListener { #[inline] unsafe fn from_raw_socket(sock: RawSocket) -> net::TcpListener { - let sock = sys::net::Socket::from_inner(OwnedSocket::from_raw_socket(sock)); - net::TcpListener::from_inner(sys_common::net::TcpListener::from_inner(sock)) + unsafe { + let sock = sys::net::Socket::from_inner(OwnedSocket::from_raw_socket(sock)); + net::TcpListener::from_inner(sys_common::net::TcpListener::from_inner(sock)) + } } } #[stable(feature = "from_raw_os", since = "1.1.0")] impl FromRawSocket for net::UdpSocket { #[inline] unsafe fn from_raw_socket(sock: RawSocket) -> net::UdpSocket { - let sock = sys::net::Socket::from_inner(OwnedSocket::from_raw_socket(sock)); - net::UdpSocket::from_inner(sys_common::net::UdpSocket::from_inner(sock)) + unsafe { + let sock = sys::net::Socket::from_inner(OwnedSocket::from_raw_socket(sock)); + net::UdpSocket::from_inner(sys_common::net::UdpSocket::from_inner(sock)) + } } } |
