feat(driver): add from_raw_* support back

Author: Berrysoft

compio-driver/src/fd.rs

@@ -1,3 +1,9 @@
+#[cfg(unix)]
+use std::os::fd::FromRawFd;
+#[cfg(windows)]
+use std::os::windows::io::{
+    FromRawHandle, FromRawSocket, OwnedHandle, OwnedSocket, RawHandle, RawSocket,
+};
 use std::{
     future::{poll_fn, Future},
     mem::ManuallyDrop,
@@ -99,14 +105,10 @@ impl Drop for SharedFd {
 #[doc(hidden)]
 impl SharedFd {
     pub unsafe fn to_file(&self) -> ManuallyDrop<std::fs::File> {
-        use std::os::windows::io::FromRawHandle;
-
         ManuallyDrop::new(std::fs::File::from_raw_handle(self.as_raw_fd() as _))
     }
 
     pub unsafe fn to_socket(&self) -> ManuallyDrop<socket2::Socket> {
-        use std::os::windows::io::FromRawSocket;
-
         ManuallyDrop::new(socket2::Socket::from_raw_socket(self.as_raw_fd() as _))
     }
 }
@@ -115,14 +117,10 @@ impl SharedFd {
 #[doc(hidden)]
 impl SharedFd {
     pub unsafe fn to_file(&self) -> ManuallyDrop<std::fs::File> {
-        use std::os::fd::FromRawFd;
-
         ManuallyDrop::new(std::fs::File::from_raw_fd(self.as_raw_fd() as _))
     }
 
     pub unsafe fn to_socket(&self) -> ManuallyDrop<socket2::Socket> {
-        use std::os::fd::FromRawFd;
-
         ManuallyDrop::new(socket2::Socket::from_raw_fd(self.as_raw_fd() as _))
     }
 }
@@ -133,6 +131,27 @@ impl AsRawFd for SharedFd {
     }
 }
 
+#[cfg(windows)]
+impl FromRawHandle for SharedFd {
+    unsafe fn from_raw_handle(handle: RawHandle) -> Self {
+        Self::new(OwnedFd::File(OwnedHandle::from_raw_handle(handle)))
+    }
+}
+
+#[cfg(windows)]
+impl FromRawSocket for SharedFd {
+    unsafe fn from_raw_socket(sock: RawSocket) -> Self {
+        Self::new(OwnedFd::Socket(OwnedSocket::from_raw_socket(sock)))
+    }
+}
+
+#[cfg(unix)]
+impl FromRawFd for SharedFd {
+    unsafe fn from_raw_fd(fd: RawFd) -> Self {
+        Self::new(OwnedFd::from_raw_fd(fd))
+    }
+}
+
 impl From<OwnedFd> for SharedFd {
     fn from(value: OwnedFd) -> Self {
         Self::new(value)

compio-driver/src/lib.rs

@@ -114,12 +114,42 @@ macro_rules! impl_raw_fd {
                 self.$inner.as_raw_fd()
             }
         }
+        #[cfg(unix)]
+        impl std::os::fd::FromRawFd for $t {
+            unsafe fn from_raw_fd(fd: $crate::RawFd) -> Self {
+                Self {
+                    $inner: std::os::fd::FromRawFd::from_raw_fd(fd),
+                }
+            }
+        }
         impl $crate::ToSharedFd for $t {
             fn to_shared_fd(&self) -> $crate::SharedFd {
                 self.$inner.to_shared_fd()
             }
         }
     };
+    ($t:ty, $inner:ident,file) => {
+        $crate::impl_raw_fd!($t, $inner);
+        #[cfg(windows)]
+        impl std::os::windows::io::FromRawHandle for $t {
+            unsafe fn from_raw_handle(handle: std::os::windows::io::RawHandle) -> Self {
+                Self {
+                    $inner: std::os::windows::io::FromRawHandle::from_raw_handle(handle),
+                }
+            }
+        }
+    };
+    ($t:ty, $inner:ident,socket) => {
+        $crate::impl_raw_fd!($t, $inner);
+        #[cfg(windows)]
+        impl std::os::windows::io::FromRawSocket for $t {
+            unsafe fn from_raw_socket(sock: std::os::windows::io::RawSocket) -> Self {
+                Self {
+                    $inner: std::os::windows::io::FromRawSocket::from_raw_socket(sock),
+                }
+            }
+        }
+    };
 }
 
 /// The return type of [`Proactor::push`].

compio-fs/src/file.rs

@@ -214,4 +214,4 @@ impl AsyncWriteAt for &File {
     }
 }
 
-impl_raw_fd!(File, inner);
+impl_raw_fd!(File, inner, file);

compio-fs/src/named_pipe.rs

@@ -229,7 +229,7 @@ impl AsyncWrite for &NamedPipeServer {
     }
 }
 
-impl_raw_fd!(NamedPipeServer, handle);
+impl_raw_fd!(NamedPipeServer, handle, file);
 
 /// A [Windows named pipe] client.
 ///
@@ -350,7 +350,7 @@ impl AsyncWrite for &NamedPipeClient {
     }
 }
 
-impl_raw_fd!(NamedPipeClient, handle);
+impl_raw_fd!(NamedPipeClient, handle, file);
 
 /// A builder structure for construct a named pipe with named pipe-specific
 /// options. This is required to use for named pipe servers who wants to modify

compio-fs/src/pipe.rs

@@ -11,7 +11,7 @@ use compio_buf::{BufResult, IntoInner, IoBuf, IoBufMut, IoVectoredBuf, IoVectore
 use compio_driver::{
     impl_raw_fd,
     op::{BufResultExt, Recv, RecvVectored, Send, SendVectored},
-    syscall, AsRawFd, RawFd, ToSharedFd,
+    syscall, AsRawFd, ToSharedFd,
 };
 use compio_io::{AsyncRead, AsyncWrite};
 use compio_runtime::Runtime;
@@ -390,15 +390,7 @@ impl AsyncWrite for &Sender {
     }
 }
 
-impl_raw_fd!(Sender, file);
-
-impl FromRawFd for Sender {
-    unsafe fn from_raw_fd(fd: RawFd) -> Self {
-        Self {
-            file: File::from_std(std::fs::File::from_raw_fd(fd)).expect("attach should be Ok"),
-        }
-    }
-}
+impl_raw_fd!(Sender, file, file);
 
 /// Reading end of a Unix pipe.
 ///
@@ -519,15 +511,7 @@ impl AsyncRead for &Receiver {
     }
 }
 
-impl_raw_fd!(Receiver, file);
-
-impl FromRawFd for Receiver {
-    unsafe fn from_raw_fd(fd: RawFd) -> Self {
-        Self {
-            file: File::from_std(std::fs::File::from_raw_fd(fd)).expect("attach should be Ok"),
-        }
-    }
-}
+impl_raw_fd!(Receiver, file, file);
 
 /// Checks if file is a FIFO
 async fn is_fifo(file: &File) -> io::Result<bool> {

compio-net/src/socket.rs

@@ -274,4 +274,4 @@ impl Socket {
     }
 }
 
-impl_raw_fd!(Socket, socket);
+impl_raw_fd!(Socket, socket, socket);

compio-net/src/tcp.rs

@@ -109,7 +109,7 @@ impl TcpListener {
     }
 }
 
-impl_raw_fd!(TcpListener, inner);
+impl_raw_fd!(TcpListener, inner, socket);
 
 /// A TCP stream between a local and a remote socket.
 ///
@@ -273,4 +273,4 @@ impl AsyncWrite for &TcpStream {
     }
 }
 
-impl_raw_fd!(TcpStream, inner);
+impl_raw_fd!(TcpStream, inner, socket);

compio-net/src/udp.rs

@@ -251,4 +251,4 @@ impl UdpSocket {
     }
 }
 
-impl_raw_fd!(UdpSocket, inner);
+impl_raw_fd!(UdpSocket, inner, socket);

compio-net/src/unix.rs

@@ -87,7 +87,7 @@ impl UnixListener {
     }
 }
 
-impl_raw_fd!(UnixListener, inner);
+impl_raw_fd!(UnixListener, inner, socket);
 
 /// A Unix stream between two local sockets on Windows & WSL.
 ///
@@ -257,7 +257,7 @@ impl AsyncWrite for &UnixStream {
     }
 }
 
-impl_raw_fd!(UnixStream, inner);
+impl_raw_fd!(UnixStream, inner, socket);
 
 #[cfg(windows)]
 #[inline]

compio-runtime/src/attacher.rs

@@ -1,3 +1,7 @@
+#[cfg(unix)]
+use std::os::fd::{FromRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{FromRawHandle, FromRawSocket, RawHandle, RawSocket};
 use std::{
     io,
     ops::{Deref, DerefMut},
@@ -52,6 +56,27 @@ impl<S> IntoInner for Attacher<S> {
     }
 }
 
+#[cfg(windows)]
+impl<S: FromRawHandle> FromRawHandle for Attacher<S> {
+    unsafe fn from_raw_handle(handle: RawHandle) -> Self {
+        Self::new_unchecked(S::from_raw_handle(handle))
+    }
+}
+
+#[cfg(windows)]
+impl<S: FromRawSocket> FromRawSocket for Attacher<S> {
+    unsafe fn from_raw_socket(sock: RawSocket) -> Self {
+        Self::new_unchecked(S::from_raw_socket(sock))
+    }
+}
+
+#[cfg(unix)]
+impl<S: FromRawFd> FromRawFd for Attacher<S> {
+    unsafe fn from_raw_fd(fd: RawFd) -> Self {
+        Self::new_unchecked(S::from_raw_fd(fd))
+    }
+}
+
 impl<S> Deref for Attacher<S> {
     type Target = S;