Auto merge of #149930 - joboet:small-sys-refactor, r=<try>

std: small `sys` refactor

try-job: dist-various-*

Author: rust-bors[bot]

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

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};
 

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

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.
 ///

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.

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.

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`].
 ///

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`].
 ///

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

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`].