Rollup merge of #126346 - hermit-os:fd, r=Amanieu · model-checking/verify-rust-std@2730879 (original) (raw)

Skip to content

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sign up

Commit 2730879

export std::os::fd module on HermitOS The HermitOS' IO interface is similiar to Unix. Consequently, this PR synchronize the FD implementation between both.closes rust-lang#126198

File tree

2 files changed

lines changed

2 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
1 -#![stable(feature = "os_fd", since = "1.66.0")]
1 +#![stable(feature = "rust1", since = "1.0.0")]
2 2
3 -mod net;
4 -#[path = "../../fd/owned.rs"]
5 -mod owned;
6 -#[path = "../../fd/raw.rs"]
7 -mod raw;
8 -
9 -// Export the types and traits for the public API.
10 -#[stable(feature = "os_fd", since = "1.66.0")]
11 -pub use owned::*;
12 -#[stable(feature = "os_fd", since = "1.66.0")]
13 -pub use raw::*;
3 +#[stable(feature = "rust1", since = "1.0.0")]
4 +pub use crate::os::fd::*;
Original file line number Diff line number Diff line change
@@ -160,7 +160,7 @@ pub(crate) mod watchos;
160 160 #[cfg(target_os = "xous")]
161 161 pub mod xous;
162 162
163 -#[cfg(any(unix, target_os = "wasi", doc))]
163 +#[cfg(any(unix, target_os = "hermit", target_os = "wasi", doc))]
164 164 pub mod fd;
165 165
166 166 #[cfg(any(target_os = "linux", target_os = "android", doc))]