From c8c3339133fb25b0e059e076fb499708df39c669 Mon Sep 17 00:00:00 2001 From: Tomoaki Kawada Date: Wed, 23 Aug 2023 18:41:26 +0900 Subject: [PATCH] kmc-solid: Reimplement `AsFd` etc for `{TcpStream,TcpListener,UdpSocket}` by delegating to inner `Socket` Removes some `unsafe` blocks. --- library/std/src/os/solid/io.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/std/src/os/solid/io.rs b/library/std/src/os/solid/io.rs index 54583c73af13..19b4fe22093c 100644 --- a/library/std/src/os/solid/io.rs +++ b/library/std/src/os/solid/io.rs @@ -250,21 +250,21 @@ macro_rules! impl_owned_fd_traits { impl AsFd for net::$t { #[inline] fn as_fd(&self) -> BorrowedFd<'_> { - unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) } + self.as_inner().socket().as_fd() } } impl From for OwnedFd { #[inline] fn from(socket: net::$t) -> OwnedFd { - unsafe { Self::from_raw_fd(socket.into_raw_fd()) } + socket.into_inner().into_socket().into_inner() } } impl From for net::$t { #[inline] fn from(owned_fd: OwnedFd) -> Self { - unsafe { Self::from_raw_fd(owned_fd.into_raw_fd()) } + Self::from_inner(FromInner::from_inner(FromInner::from_inner(owned_fd))) } } )*};