diff options
| -rw-r--r-- | library/std/src/os/mod.rs | 6 | ||||
| -rw-r--r-- | library/std/src/os/unix/ffi.rs (renamed from library/std/src/sys/unix/ext/ffi.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/fs.rs (renamed from library/std/src/sys/unix/ext/fs.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/io.rs (renamed from library/std/src/sys/unix/ext/io.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/mod.rs (renamed from library/std/src/sys/unix/ext/mod.rs) | 1 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/addr.rs (renamed from library/std/src/sys/unix/ext/net/addr.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/ancillary.rs (renamed from library/std/src/sys/unix/ext/net/ancillary.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/datagram.rs (renamed from library/std/src/sys/unix/ext/net/datagram.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/listener.rs (renamed from library/std/src/sys/unix/ext/net/listener.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/mod.rs (renamed from library/std/src/sys/unix/ext/net/mod.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/raw_fd.rs (renamed from library/std/src/sys/unix/ext/net/raw_fd.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/stream.rs (renamed from library/std/src/sys/unix/ext/net/stream.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/tests.rs (renamed from library/std/src/sys/unix/ext/net/tests.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/process.rs (renamed from library/std/src/sys/unix/ext/process.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/raw.rs (renamed from library/std/src/sys/unix/ext/raw.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/thread.rs (renamed from library/std/src/sys/unix/ext/thread.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/ucred.rs (renamed from library/std/src/sys/unix/ext/ucred.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/unix/ucred/tests.rs (renamed from library/std/src/sys/unix/ext/ucred/tests.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/mod.rs | 16 | ||||
| -rw-r--r-- | library/std/src/sys/unix/mod.rs | 1 |
20 files changed, 2 insertions, 22 deletions
diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs index 85ffe8adb1f..abc29a138c8 100644 --- a/library/std/src/os/mod.rs +++ b/library/std/src/os/mod.rs @@ -15,8 +15,7 @@ cfg_if::cfg_if! { // This should help show platform-specific functionality in a hopefully cross-platform // way in the documentation. - #[stable(feature = "rust1", since = "1.0.0")] - pub use crate::sys::unix_ext as unix; + pub mod unix; pub mod linux; @@ -53,8 +52,7 @@ cfg_if::cfg_if! { pub use hermit as unix; #[cfg(unix)] - #[stable(feature = "rust1", since = "1.0.0")] - pub use crate::sys::ext as unix; + pub mod unix; #[cfg(target_os = "android")] pub mod android; #[cfg(target_os = "dragonfly")] diff --git a/library/std/src/sys/unix/ext/ffi.rs b/library/std/src/os/unix/ffi.rs index 123f85deaf9..123f85deaf9 100644 --- a/library/std/src/sys/unix/ext/ffi.rs +++ b/library/std/src/os/unix/ffi.rs diff --git a/library/std/src/sys/unix/ext/fs.rs b/library/std/src/os/unix/fs.rs index 9cf51be2836..9cf51be2836 100644 --- a/library/std/src/sys/unix/ext/fs.rs +++ b/library/std/src/os/unix/fs.rs diff --git a/library/std/src/sys/unix/ext/io.rs b/library/std/src/os/unix/io.rs index 07c30bfa9ed..07c30bfa9ed 100644 --- a/library/std/src/sys/unix/ext/io.rs +++ b/library/std/src/os/unix/io.rs diff --git a/library/std/src/sys/unix/ext/mod.rs b/library/std/src/os/unix/mod.rs index 735bf35a3ce..a93ed333cec 100644 --- a/library/std/src/sys/unix/ext/mod.rs +++ b/library/std/src/os/unix/mod.rs @@ -27,7 +27,6 @@ #![stable(feature = "rust1", since = "1.0.0")] #![doc(cfg(unix))] -#![allow(missing_docs)] cfg_if::cfg_if! { if #[cfg(doc)] { diff --git a/library/std/src/sys/unix/ext/net/addr.rs b/library/std/src/os/unix/net/addr.rs index 459f3590e64..459f3590e64 100644 --- a/library/std/src/sys/unix/ext/net/addr.rs +++ b/library/std/src/os/unix/net/addr.rs diff --git a/library/std/src/sys/unix/ext/net/ancillary.rs b/library/std/src/os/unix/net/ancillary.rs index 15ce7056fea..15ce7056fea 100644 --- a/library/std/src/sys/unix/ext/net/ancillary.rs +++ b/library/std/src/os/unix/net/ancillary.rs diff --git a/library/std/src/sys/unix/ext/net/datagram.rs b/library/std/src/os/unix/net/datagram.rs index 9e39f70f68e..9e39f70f68e 100644 --- a/library/std/src/sys/unix/ext/net/datagram.rs +++ b/library/std/src/os/unix/net/datagram.rs diff --git a/library/std/src/sys/unix/ext/net/listener.rs b/library/std/src/os/unix/net/listener.rs index bdd08fe8380..bdd08fe8380 100644 --- a/library/std/src/sys/unix/ext/net/listener.rs +++ b/library/std/src/os/unix/net/listener.rs diff --git a/library/std/src/sys/unix/ext/net/mod.rs b/library/std/src/os/unix/net/mod.rs index 3088ffb5e5c..3088ffb5e5c 100644 --- a/library/std/src/sys/unix/ext/net/mod.rs +++ b/library/std/src/os/unix/net/mod.rs diff --git a/library/std/src/sys/unix/ext/net/raw_fd.rs b/library/std/src/os/unix/net/raw_fd.rs index b3f12844101..b3f12844101 100644 --- a/library/std/src/sys/unix/ext/net/raw_fd.rs +++ b/library/std/src/os/unix/net/raw_fd.rs diff --git a/library/std/src/sys/unix/ext/net/stream.rs b/library/std/src/os/unix/net/stream.rs index a6f6e091305..a6f6e091305 100644 --- a/library/std/src/sys/unix/ext/net/stream.rs +++ b/library/std/src/os/unix/net/stream.rs diff --git a/library/std/src/sys/unix/ext/net/tests.rs b/library/std/src/os/unix/net/tests.rs index bd9b6dd727b..bd9b6dd727b 100644 --- a/library/std/src/sys/unix/ext/net/tests.rs +++ b/library/std/src/os/unix/net/tests.rs diff --git a/library/std/src/sys/unix/ext/process.rs b/library/std/src/os/unix/process.rs index 355855bcd10..355855bcd10 100644 --- a/library/std/src/sys/unix/ext/process.rs +++ b/library/std/src/os/unix/process.rs diff --git a/library/std/src/sys/unix/ext/raw.rs b/library/std/src/os/unix/raw.rs index c292955cb4e..c292955cb4e 100644 --- a/library/std/src/sys/unix/ext/raw.rs +++ b/library/std/src/os/unix/raw.rs diff --git a/library/std/src/sys/unix/ext/thread.rs b/library/std/src/os/unix/thread.rs index 7221da1a9a7..7221da1a9a7 100644 --- a/library/std/src/sys/unix/ext/thread.rs +++ b/library/std/src/os/unix/thread.rs diff --git a/library/std/src/sys/unix/ext/ucred.rs b/library/std/src/os/unix/ucred.rs index 1b4c18d3d84..1b4c18d3d84 100644 --- a/library/std/src/sys/unix/ext/ucred.rs +++ b/library/std/src/os/unix/ucred.rs diff --git a/library/std/src/sys/unix/ext/ucred/tests.rs b/library/std/src/os/unix/ucred/tests.rs index 42d79418cf7..42d79418cf7 100644 --- a/library/std/src/sys/unix/ext/ucred/tests.rs +++ b/library/std/src/os/unix/ucred/tests.rs diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index 6b38f62dfe5..9906d5c4985 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -62,22 +62,6 @@ cfg_if::cfg_if! { all(target_vendor = "fortanix", target_env = "sgx") )))] cfg_if::cfg_if! { - if #[cfg(unix)] { - #[stable(feature = "rust1", since = "1.0.0")] - pub use self::ext as unix_ext; - } else { - #[path = "unix/ext/mod.rs"] - pub mod unix_ext; - } -} - -#[cfg(doc)] -#[cfg(not(any( - target_os = "hermit", - all(target_arch = "wasm32", not(target_os = "wasi")), - all(target_vendor = "fortanix", target_env = "sgx") -)))] -cfg_if::cfg_if! { if #[cfg(not(windows))] { // On non-Windows platforms (aka linux/osx/etc) pull in a "minimal" // amount of windows goop which ends up compiling diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs index 562d9d92637..57d91441b6f 100644 --- a/library/std/src/sys/unix/mod.rs +++ b/library/std/src/sys/unix/mod.rs @@ -15,7 +15,6 @@ pub mod args; pub mod cmath; pub mod condvar; pub mod env; -pub mod ext; pub mod fd; pub mod fs; pub mod futex; |
