Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2730879

Browse files
authoredJun 17, 2024
Rollup merge of rust-lang#126346 - hermit-os:fd, r=Amanieu
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
2 parents ebbce69 + 47090b1 commit 2730879

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed
 

‎std/src/os/hermit/io/mod.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
#![stable(feature = "os_fd", since = "1.66.0")]
1+
#![stable(feature = "rust1", since = "1.0.0")]
22

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::*;

‎std/src/os/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ pub(crate) mod watchos;
160160
#[cfg(target_os = "xous")]
161161
pub mod xous;
162162

163-
#[cfg(any(unix, target_os = "wasi", doc))]
163+
#[cfg(any(unix, target_os = "hermit", target_os = "wasi", doc))]
164164
pub mod fd;
165165

166166
#[cfg(any(target_os = "linux", target_os = "android", doc))]

0 commit comments

Comments
 (0)
Failed to load comments.