Skip to content

Commit a808fd4

Browse files
committed
Move std::sys::unix::ext to std::os::unix
1 parent ffc20e4 commit a808fd4

20 files changed

+2
-22
lines changed

library/std/src/os/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ cfg_if::cfg_if! {
1515
// This should help show platform-specific functionality in a hopefully cross-platform
1616
// way in the documentation.
1717

18-
#[stable(feature = "rust1", since = "1.0.0")]
19-
pub use crate::sys::unix_ext as unix;
18+
pub mod unix;
2019

2120
pub mod linux;
2221

@@ -53,8 +52,7 @@ cfg_if::cfg_if! {
5352
pub use hermit as unix;
5453

5554
#[cfg(unix)]
56-
#[stable(feature = "rust1", since = "1.0.0")]
57-
pub use crate::sys::ext as unix;
55+
pub mod unix;
5856
#[cfg(target_os = "android")]
5957
pub mod android;
6058
#[cfg(target_os = "dragonfly")]
File renamed without changes.
File renamed without changes.
File renamed without changes.

library/std/src/sys/unix/ext/mod.rs renamed to library/std/src/os/unix/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
2828
#![stable(feature = "rust1", since = "1.0.0")]
2929
#![doc(cfg(unix))]
30-
#![allow(missing_docs)]
3130

3231
cfg_if::cfg_if! {
3332
if #[cfg(doc)] {
File renamed without changes.

library/std/src/sys/mod.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,6 @@ cfg_if::cfg_if! {
5555
// (missing things in `libc` which is empty), so they are not included in `std::os` and can be
5656
// omitted here as well.
5757

58-
#[cfg(doc)]
59-
#[cfg(not(any(
60-
target_os = "hermit",
61-
all(target_arch = "wasm32", not(target_os = "wasi")),
62-
all(target_vendor = "fortanix", target_env = "sgx")
63-
)))]
64-
cfg_if::cfg_if! {
65-
if #[cfg(unix)] {
66-
#[stable(feature = "rust1", since = "1.0.0")]
67-
pub use self::ext as unix_ext;
68-
} else {
69-
#[path = "unix/ext/mod.rs"]
70-
pub mod unix_ext;
71-
}
72-
}
73-
7458
#[cfg(doc)]
7559
#[cfg(not(any(
7660
target_os = "hermit",

library/std/src/sys/unix/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub mod args;
1515
pub mod cmath;
1616
pub mod condvar;
1717
pub mod env;
18-
pub mod ext;
1918
pub mod fd;
2019
pub mod fs;
2120
pub mod futex;

0 commit comments

Comments
 (0)