diff options
| author | Christiaan Dirkx <christiaan@dirkx.email> | 2021-03-04 14:14:44 +0100 |
|---|---|---|
| committer | Christiaan Dirkx <christiaan@dirkx.email> | 2021-05-03 16:56:20 +0200 |
| commit | 7024bfffbdd1fb3dafa3f263f6d10fd2aed2ff2d (patch) | |
| tree | 75237bc9e079811d21c3bde8c450ffbc251673e9 /library/std | |
| parent | 0e2cd33db84a4787391989c69ed3ce70ce8c07ec (diff) | |
| download | rust-7024bfffbdd1fb3dafa3f263f6d10fd2aed2ff2d.tar.gz rust-7024bfffbdd1fb3dafa3f263f6d10fd2aed2ff2d.zip | |
Move `std::sys::hermit::ext` to `std::os::hermit`
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/os/hermit/ffi.rs (renamed from library/std/src/sys/hermit/ext/ffi.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/os/hermit/mod.rs (renamed from library/std/src/sys/hermit/ext/mod.rs) | 1 | ||||
| -rw-r--r-- | library/std/src/os/mod.rs | 7 | ||||
| -rw-r--r-- | library/std/src/sys/hermit/mod.rs | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/library/std/src/sys/hermit/ext/ffi.rs b/library/std/src/os/hermit/ffi.rs index 07b59a02556..07b59a02556 100644 --- a/library/std/src/sys/hermit/ext/ffi.rs +++ b/library/std/src/os/hermit/ffi.rs diff --git a/library/std/src/sys/hermit/ext/mod.rs b/library/std/src/os/hermit/mod.rs index ea87d0ad2c9..4657b545a1b 100644 --- a/library/std/src/sys/hermit/ext/mod.rs +++ b/library/std/src/os/hermit/mod.rs @@ -1,5 +1,4 @@ #![stable(feature = "rust1", since = "1.0.0")] -#![allow(missing_docs)] pub mod ffi; diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs index 7e333e2b778..fc684f0912f 100644 --- a/library/std/src/os/mod.rs +++ b/library/std/src/os/mod.rs @@ -48,7 +48,12 @@ cfg_if::cfg_if! { #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] pub mod fortanix_sgx; - #[cfg(any(unix, target_os = "hermit"))] + #[cfg(target_os = "hermit")] + mod hermit; + #[cfg(target_os = "hermit")] + pub use hermit as unix; + + #[cfg(unix)] #[stable(feature = "rust1", since = "1.0.0")] pub use crate::sys::ext as unix; #[cfg(target_os = "android")] diff --git a/library/std/src/sys/hermit/mod.rs b/library/std/src/sys/hermit/mod.rs index 0c49a6fb6de..15a76bbd2c9 100644 --- a/library/std/src/sys/hermit/mod.rs +++ b/library/std/src/sys/hermit/mod.rs @@ -24,7 +24,6 @@ pub mod args; pub mod cmath; pub mod condvar; pub mod env; -pub mod ext; pub mod fd; pub mod fs; #[path = "../unsupported/io.rs"] |