Use std::os::fd module

Author: Darksonn

src/sockaddr.rs

@@ -93,7 +93,7 @@ impl SockAddr {
     /// # fn main() -> std::io::Result<()> {
     /// # #[cfg(unix)] {
     /// use std::io;
-    /// use std::os::unix::io::AsRawFd;
+    /// use std::os::fd::AsRawFd;
     ///
     /// use socket2::{SockAddr, SockAddrStorage, Socket, Domain, Type};
     ///
@@ -151,7 +151,7 @@ impl SockAddr {
     /// # fn main() -> std::io::Result<()> {
     /// # #[cfg(unix)] {
     /// use std::io;
-    /// use std::os::unix::io::AsRawFd;
+    /// use std::os::fd::AsRawFd;
     ///
     /// use socket2::{SockAddr, Socket, Domain, Type};
     ///

src/socket.rs

@@ -15,7 +15,7 @@ use std::mem::MaybeUninit;
 use std::net::Ipv6Addr;
 use std::net::{self, Ipv4Addr, Shutdown};
 #[cfg(unix)]
-use std::os::unix::io::{FromRawFd, IntoRawFd};
+use std::os::fd::{FromRawFd, IntoRawFd};
 #[cfg(windows)]
 use std::os::windows::io::{FromRawSocket, IntoRawSocket};
 use std::time::Duration;

src/sockref.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use std::mem::ManuallyDrop;
 use std::ops::Deref;
 #[cfg(unix)]
-use std::os::unix::io::{AsFd, AsRawFd, FromRawFd};
+use std::os::fd::{AsFd, AsRawFd, FromRawFd};
 #[cfg(windows)]
 use std::os::windows::io::{AsRawSocket, AsSocket, FromRawSocket};
 

src/sys/unix.rs

@@ -44,23 +44,8 @@ use std::num::NonZeroU32;
     )
 ))]
 use std::num::NonZeroUsize;
+use std::os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 use std::os::unix::ffi::OsStrExt;
-#[cfg(all(
-    feature = "all",
-    any(
-        target_os = "aix",
-        target_os = "android",
-        target_os = "freebsd",
-        target_os = "ios",
-        target_os = "visionos",
-        target_os = "linux",
-        target_os = "macos",
-        target_os = "tvos",
-        target_os = "watchos",
-    )
-))]
-use std::os::unix::io::RawFd;
-use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd};
 #[cfg(feature = "all")]
 use std::os::unix::net::{UnixDatagram, UnixListener, UnixStream};
 use std::path::Path;
@@ -2880,7 +2865,7 @@ impl AsFd for crate::Socket {
 }
 
 impl AsRawFd for crate::Socket {
-    fn as_raw_fd(&self) -> c_int {
+    fn as_raw_fd(&self) -> RawFd {
         self.as_raw()
     }
 }