rust-lang · joboet · Dec 12, 2025 · Dec 12, 2025 · Dec 12, 2025 · Dec 12, 2025
diff --git a/library/std/src/ffi/os_str.rs b/library/std/src/ffi/os_str.rs
@@ -13,7 +13,7 @@ use crate::rc::Rc;
 use crate::str::FromStr;
 use crate::sync::Arc;
 use crate::sys::os_str::{Buf, Slice};
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner};
 use crate::{cmp, fmt, slice};
 
 /// A type that can represent owned, mutable platform-native strings, but is

diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs
@@ -46,8 +46,7 @@ use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut, Read, Seek, SeekFrom,
 use crate::path::{Path, PathBuf};
 use crate::sealed::Sealed;
 use crate::sync::Arc;
-use crate::sys::fs as fs_imp;
-use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
+use crate::sys::{AsInner, AsInnerMut, FromInner, IntoInner, fs as fs_imp};
 use crate::time::SystemTime;
 use crate::{error, fmt};
 

diff --git a/library/std/src/io/error.rs b/library/std/src/io/error.rs
@@ -139,7 +139,7 @@ enum ErrorData<C> {
 ///
 /// [`into`]: Into::into
 #[unstable(feature = "raw_os_error_ty", issue = "107792")]
-pub type RawOsError = sys::RawOsError;
+pub type RawOsError = sys::io::RawOsError;
 
 // `#[repr(align(4))]` is probably redundant, it should have that value or
 // higher already. We include it just because repr_bitpacked.rs's encoding

diff --git a/library/std/src/io/pipe.rs b/library/std/src/io/pipe.rs
@@ -1,6 +1,6 @@
 use crate::io;
 use crate::sys::anonymous_pipe::{AnonPipe, pipe as pipe_inner};
-use crate::sys_common::{FromInner, IntoInner};
+use crate::sys::{FromInner, IntoInner};
 
 /// Creates an anonymous pipe.
 ///

diff --git a/library/std/src/net/tcp.rs b/library/std/src/net/tcp.rs
@@ -16,8 +16,7 @@ use crate::io::prelude::*;
 use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut};
 use crate::iter::FusedIterator;
 use crate::net::{Shutdown, SocketAddr, ToSocketAddrs};
-use crate::sys::net as net_imp;
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner, net as net_imp};
 use crate::time::Duration;
 
 /// A TCP stream between a local and a remote socket.

diff --git a/library/std/src/net/udp.rs b/library/std/src/net/udp.rs
@@ -13,8 +13,7 @@ mod tests;
 use crate::fmt;
 use crate::io::{self, ErrorKind};
 use crate::net::{Ipv4Addr, Ipv6Addr, SocketAddr, ToSocketAddrs};
-use crate::sys::net as net_imp;
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner, net as net_imp};
 use crate::time::Duration;
 
 /// A UDP socket.

diff --git a/library/std/src/os/aix/fs.rs b/library/std/src/os/aix/fs.rs
@@ -5,7 +5,7 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/android/fs.rs b/library/std/src/os/android/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::android::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/cygwin/fs.rs b/library/std/src/os/cygwin/fs.rs
@@ -1,6 +1,6 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 /// OS-specific extensions to [`fs::Metadata`].
 ///
 /// [`fs::Metadata`]: crate::fs::Metadata

diff --git a/library/std/src/os/darwin/fs.rs b/library/std/src/os/darwin/fs.rs
@@ -5,7 +5,7 @@
 
 use crate::fs::{self, Metadata};
 use crate::sealed::Sealed;
-use crate::sys_common::{AsInner, AsInnerMut, IntoInner};
+use crate::sys::{AsInner, AsInnerMut, IntoInner};
 use crate::time::SystemTime;
 
 /// OS-specific extensions to [`fs::Metadata`].

diff --git a/library/std/src/os/dragonfly/fs.rs b/library/std/src/os/dragonfly/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::dragonfly::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/emscripten/fs.rs b/library/std/src/os/emscripten/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::emscripten::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/espidf/fs.rs b/library/std/src/os/espidf/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::espidf::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/fd/net.rs b/library/std/src/os/fd/net.rs
@@ -1,6 +1,6 @@
 use crate::os::fd::owned::OwnedFd;
 use crate::os::fd::raw::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner};
 use crate::{net, sys};
 
 macro_rules! impl_as_raw_fd {

diff --git a/library/std/src/os/fd/owned.rs b/library/std/src/os/fd/owned.rs
@@ -20,7 +20,7 @@ use crate::mem::ManuallyDrop;
 )))]
 use crate::sys::cvt;
 #[cfg(not(target_os = "trusty"))]
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner};
 use crate::{fmt, io};
 
 type ValidRawFd = core::num::niche_types::NotAllOnes<RawFd>;

diff --git a/library/std/src/os/fd/raw.rs b/library/std/src/os/fd/raw.rs
@@ -23,7 +23,7 @@ use crate::os::unix::io::OwnedFd;
 #[cfg(target_os = "wasi")]
 use crate::os::wasi::io::OwnedFd;
 #[cfg(not(target_os = "trusty"))]
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner};
 
 /// Raw file descriptors.
 #[stable(feature = "rust1", since = "1.0.0")]

diff --git a/library/std/src/os/freebsd/fs.rs b/library/std/src/os/freebsd/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::freebsd::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/freebsd/net.rs b/library/std/src/os/freebsd/net.rs
@@ -6,7 +6,7 @@ use crate::ffi::CStr;
 use crate::io;
 use crate::os::unix::net;
 use crate::sealed::Sealed;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// FreeBSD-specific functionality for `AF_UNIX` sockets [`UnixDatagram`]
 /// and [`UnixStream`].

diff --git a/library/std/src/os/fuchsia/fs.rs b/library/std/src/os/fuchsia/fs.rs
@@ -1,7 +1,7 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/haiku/fs.rs b/library/std/src/os/haiku/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::haiku::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/hermit/io/net.rs b/library/std/src/os/hermit/io/net.rs
@@ -1,6 +1,6 @@
+use crate::net;
 use crate::os::hermit::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
-use crate::sys_common::{self, AsInner, FromInner, IntoInner};
-use crate::{net, sys};
+use crate::sys::{self, AsInner, FromInner, IntoInner};
 
 macro_rules! impl_as_raw_fd {
     ($($t:ident)*) => {$(

diff --git a/library/std/src/os/horizon/fs.rs b/library/std/src/os/horizon/fs.rs
@@ -1,7 +1,7 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/hurd/fs.rs b/library/std/src/os/hurd/fs.rs
@@ -5,7 +5,7 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/illumos/fs.rs b/library/std/src/os/illumos/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::illumos::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/illumos/net.rs b/library/std/src/os/illumos/net.rs
@@ -5,7 +5,7 @@
 use crate::io;
 use crate::os::unix::net;
 use crate::sealed::Sealed;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// illumos-specific functionality for `AF_UNIX` sockets [`UnixDatagram`]
 /// and [`UnixStream`].

diff --git a/library/std/src/os/l4re/fs.rs b/library/std/src/os/l4re/fs.rs
@@ -7,7 +7,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::l4re::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/linux/fs.rs b/library/std/src/os/linux/fs.rs
@@ -7,7 +7,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::linux::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/linux/process.rs b/library/std/src/os/linux/process.rs
@@ -8,9 +8,9 @@ use crate::io::Result;
 use crate::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 use crate::process::{self, ExitStatus};
 use crate::sealed::Sealed;
+use crate::sys::{AsInner, AsInnerMut, FromInner, IntoInner};
 #[cfg(not(doc))]
 use crate::sys::{fd::FileDesc, linux::pidfd::PidFd as InnerPidFd};
-use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
 
 #[cfg(doc)]
 struct InnerPidFd;

diff --git a/library/std/src/os/motor/ffi.rs b/library/std/src/os/motor/ffi.rs
@@ -3,7 +3,7 @@
 
 use crate::ffi::{OsStr, OsString};
 use crate::sealed::Sealed;
-use crate::sys_common::{AsInner, IntoInner};
+use crate::sys::{AsInner, IntoInner};
 
 /// Motor OS–specific extensions to [`OsString`].
 ///

diff --git a/library/std/src/os/motor/process.rs b/library/std/src/os/motor/process.rs
@@ -1,7 +1,7 @@
 #![unstable(feature = "motor_ext", issue = "147456")]
 
 use crate::sealed::Sealed;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 pub trait ChildExt: Sealed {
     /// Extracts the main thread raw handle, without taking ownership

diff --git a/library/std/src/os/net/linux_ext/socket.rs b/library/std/src/os/net/linux_ext/socket.rs
@@ -3,7 +3,7 @@
 use crate::io;
 use crate::os::unix::net;
 use crate::sealed::Sealed;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// Linux-specific functionality for `AF_UNIX` sockets [`UnixDatagram`]
 /// and [`UnixStream`].

diff --git a/library/std/src/os/net/linux_ext/tcp.rs b/library/std/src/os/net/linux_ext/tcp.rs
@@ -3,7 +3,7 @@
 //! [`std::net`]: crate::net
 
 use crate::sealed::Sealed;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 #[cfg(target_os = "linux")]
 use crate::time::Duration;
 use crate::{io, net};

diff --git a/library/std/src/os/netbsd/fs.rs b/library/std/src/os/netbsd/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::netbsd::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/netbsd/net.rs b/library/std/src/os/netbsd/net.rs
@@ -6,7 +6,7 @@ use crate::ffi::CStr;
 use crate::io;
 use crate::os::unix::net;
 use crate::sealed::Sealed;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// NetBSD-specific functionality for `AF_UNIX` sockets [`UnixDatagram`]
 /// and [`UnixStream`].

diff --git a/library/std/src/os/nto/fs.rs b/library/std/src/os/nto/fs.rs
@@ -1,7 +1,7 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 #[stable(feature = "metadata_ext", since = "1.1.0")]
 pub trait MetadataExt {

diff --git a/library/std/src/os/nuttx/fs.rs b/library/std/src/os/nuttx/fs.rs
@@ -1,7 +1,7 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 #[stable(feature = "metadata_ext", since = "1.1.0")]
 pub trait MetadataExt {

diff --git a/library/std/src/os/openbsd/fs.rs b/library/std/src/os/openbsd/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::openbsd::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/redox/fs.rs b/library/std/src/os/redox/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::redox::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/rtems/fs.rs b/library/std/src/os/rtems/fs.rs
@@ -1,7 +1,7 @@
 #![stable(feature = "metadata_ext", since = "1.1.0")]
 
 use crate::fs::Metadata;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/solaris/fs.rs b/library/std/src/os/solaris/fs.rs
@@ -3,7 +3,7 @@
 use crate::fs::Metadata;
 #[allow(deprecated)]
 use crate::os::solaris::raw;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// OS-specific extensions to [`fs::Metadata`].
 ///

diff --git a/library/std/src/os/solaris/net.rs b/library/std/src/os/solaris/net.rs
@@ -5,7 +5,7 @@
 use crate::io;
 use crate::os::unix::net;
 use crate::sealed::Sealed;
-use crate::sys_common::AsInner;
+use crate::sys::AsInner;
 
 /// solaris-specific functionality for `AF_UNIX` sockets [`UnixDatagram`]
 /// and [`UnixStream`].

diff --git a/library/std/src/os/solid/io.rs b/library/std/src/os/solid/io.rs
@@ -48,7 +48,7 @@
 
 use crate::marker::PhantomData;
 use crate::mem::ManuallyDrop;
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner};
 use crate::{fmt, net, sys};
 
 /// Raw file descriptors.

diff --git a/library/std/src/os/unix/ffi/os_str.rs b/library/std/src/os/unix/ffi/os_str.rs
@@ -2,7 +2,7 @@ use crate::ffi::{OsStr, OsString};
 use crate::mem;
 use crate::sealed::Sealed;
 use crate::sys::os_str::Buf;
-use crate::sys_common::{AsInner, FromInner, IntoInner};
+use crate::sys::{AsInner, FromInner, IntoInner};
 
 // Note: this file is currently reused in other `std::os::{platform}::ffi` modules to reduce duplication.
 // Keep this in mind when applying changes to this file that only apply to `unix`.

diff --git a/library/std/src/os/unix/fs.rs b/library/std/src/os/unix/fs.rs
@@ -15,7 +15,7 @@ use crate::io::BorrowedCursor;
 use crate::os::unix::io::{AsFd, AsRawFd};
 use crate::path::Path;
 use crate::sealed::Sealed;
-use crate::sys_common::{AsInner, AsInnerMut, FromInner};
+use crate::sys::{AsInner, AsInnerMut, FromInner};
 use crate::{io, sys};
 
 // Tests for this module