diff options
| author | bors <bors@rust-lang.org> | 2024-06-17 04:01:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-17 04:01:54 +0000 |
| commit | fd7eefc2753e867053a1c567a7b504ae308e3f85 (patch) | |
| tree | 9102bb2ec2d52d0799ec0fe03a6f58ad2b90d3b0 /library/std | |
| parent | e794b0f8557c187b5909d889aa35071f81e0a4cc (diff) | |
| parent | d92aa567b9846e1ad4e275da7ea74b8a7c5add55 (diff) | |
| download | rust-fd7eefc2753e867053a1c567a7b504ae308e3f85.tar.gz rust-fd7eefc2753e867053a1c567a7b504ae308e3f85.zip | |
Auto merge of #126569 - jieyouxu:rollup-1uvkb2y, r=jieyouxu
Rollup of 8 pull requests Successful merges: - #125258 (Resolve elided lifetimes in assoc const to static if no other lifetimes are in scope) - #126250 (docs(change): Don't mention a Cargo 2024 edition change for 1.79) - #126288 (doc: Added commas where needed) - #126346 (export std::os::fd module on HermitOS) - #126468 (div_euclid, rem_euclid: clarify/extend documentation) - #126531 (Add codegen test for `Request::provide_*`) - #126535 (coverage: Arrange span extraction/refinement as a series of passes) - #126538 (coverage: Several small improvements to graph code) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/os/hermit/io/mod.rs | 15 | ||||
| -rw-r--r-- | library/std/src/os/mod.rs | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/library/std/src/os/hermit/io/mod.rs b/library/std/src/os/hermit/io/mod.rs index 524dfae0d63..df93f63a003 100644 --- a/library/std/src/os/hermit/io/mod.rs +++ b/library/std/src/os/hermit/io/mod.rs @@ -1,13 +1,4 @@ -#![stable(feature = "os_fd", since = "1.66.0")] +#![stable(feature = "rust1", since = "1.0.0")] -mod net; -#[path = "../../fd/owned.rs"] -mod owned; -#[path = "../../fd/raw.rs"] -mod raw; - -// Export the types and traits for the public API. -#[stable(feature = "os_fd", since = "1.66.0")] -pub use owned::*; -#[stable(feature = "os_fd", since = "1.66.0")] -pub use raw::*; +#[stable(feature = "rust1", since = "1.0.0")] +pub use crate::os::fd::*; diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs index ca3584e82f9..d2a7b316b81 100644 --- a/library/std/src/os/mod.rs +++ b/library/std/src/os/mod.rs @@ -160,7 +160,7 @@ pub(crate) mod watchos; #[cfg(target_os = "xous")] pub mod xous; -#[cfg(any(unix, target_os = "wasi", doc))] +#[cfg(any(unix, target_os = "hermit", target_os = "wasi", doc))] pub mod fd; #[cfg(any(target_os = "linux", target_os = "android", doc))] |