diff options
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/os/mod.rs | 3 | ||||
| -rw-r--r-- | library/std/src/os/wasi.rs | 6 | ||||
| -rw-r--r-- | library/std/src/os/wasi/ffi.rs (renamed from library/std/src/sys/wasi/ext/ffi.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/wasi/fs.rs (renamed from library/std/src/sys/wasi/ext/fs.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/wasi/io.rs (renamed from library/std/src/sys/wasi/ext/io.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/wasi/mod.rs (renamed from library/std/src/sys/wasi/ext/mod.rs) | 1 | ||||
| -rw-r--r-- | library/std/src/sys/mod.rs | 17 | ||||
| -rw-r--r-- | library/std/src/sys/wasi/mod.rs | 1 |
8 files changed, 2 insertions, 26 deletions
diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs index abc29a138c8..ecaa25cf800 100644 --- a/library/std/src/os/mod.rs +++ b/library/std/src/os/mod.rs @@ -19,8 +19,7 @@ cfg_if::cfg_if! { pub mod linux; - #[stable(feature = "wasi_ext_doc", since = "1.35.0")] - pub use crate::sys::wasi_ext as wasi; + pub mod wasi; pub mod windows; } else if #[cfg(doc)] { diff --git a/library/std/src/os/wasi.rs b/library/std/src/os/wasi.rs deleted file mode 100644 index d25b8d39ed6..00000000000 --- a/library/std/src/os/wasi.rs +++ /dev/null @@ -1,6 +0,0 @@ -//! WASI-specific definitions - -#![stable(feature = "raw_ext", since = "1.1.0")] - -#[stable(feature = "rust1", since = "1.0.0")] -pub use crate::sys::ext::*; diff --git a/library/std/src/sys/wasi/ext/ffi.rs b/library/std/src/os/wasi/ffi.rs index f71f316d1ba..f71f316d1ba 100644 --- a/library/std/src/sys/wasi/ext/ffi.rs +++ b/library/std/src/os/wasi/ffi.rs diff --git a/library/std/src/sys/wasi/ext/fs.rs b/library/std/src/os/wasi/fs.rs index ba4057bd34c..ba4057bd34c 100644 --- a/library/std/src/sys/wasi/ext/fs.rs +++ b/library/std/src/os/wasi/fs.rs diff --git a/library/std/src/sys/wasi/ext/io.rs b/library/std/src/os/wasi/io.rs index b2e79cc1b4a..b2e79cc1b4a 100644 --- a/library/std/src/sys/wasi/ext/io.rs +++ b/library/std/src/os/wasi/io.rs diff --git a/library/std/src/sys/wasi/ext/mod.rs b/library/std/src/os/wasi/mod.rs index b08402f0776..66edb953677 100644 --- a/library/std/src/sys/wasi/ext/mod.rs +++ b/library/std/src/os/wasi/mod.rs @@ -25,6 +25,7 @@ //! } //! ``` +#![stable(feature = "rust1", since = "1.0.0")] #![deny(unsafe_op_in_unsafe_fn)] #![doc(cfg(target_os = "wasi"))] diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index 9906d5c4985..ac217db2eb3 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -74,20 +74,3 @@ cfg_if::cfg_if! { pub mod c; } } - -#[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(target_os = "wasi")] { - #[stable(feature = "wasi_ext_doc", since = "1.35.0")] - pub use self::ext as wasi_ext; - } else { - #[path = "wasi/ext/mod.rs"] - #[stable(feature = "wasi_ext_doc", since = "1.35.0")] - pub mod wasi_ext; - } -} diff --git a/library/std/src/sys/wasi/mod.rs b/library/std/src/sys/wasi/mod.rs index 88b81d455d2..45a829c0cd2 100644 --- a/library/std/src/sys/wasi/mod.rs +++ b/library/std/src/sys/wasi/mod.rs @@ -33,7 +33,6 @@ pub mod mutex; pub mod net; pub mod os; pub use crate::sys_common::os_str_bytes as os_str; -pub mod ext; #[path = "../unix/path.rs"] pub mod path; #[path = "../unsupported/pipe.rs"] |
