diff options
| author | bors <bors@rust-lang.org> | 2023-10-14 18:46:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-14 18:46:19 +0000 |
| commit | ee8c9d3c34719a129f280cd91ba5d324017bb02b (patch) | |
| tree | e1ab870ec5d3cf3b4bc8e3875daf98c62c02c6fb /library/std/src/sys/unix/process/mod.rs | |
| parent | 8de6f99e32d576d1a0969b75e9b206a4a55c9f7b (diff) | |
| parent | 77b578f72bbab10cc74581a6ef718b5395c4f2e5 (diff) | |
| download | rust-ee8c9d3c34719a129f280cd91ba5d324017bb02b.tar.gz rust-ee8c9d3c34719a129f280cd91ba5d324017bb02b.zip | |
Auto merge of #116737 - matthiaskrgr:rollup-jftlnmt, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #115439 (rustdoc: hide `#[repr(transparent)]` if it isn't part of the public ABI) - #116591 (Don't accidentally detect the commit hash as an `fadd` instruction) - #116603 (Reorganize `bootstrap/Cargo.toml`) - #116715 (Prevent more spurious unreachable pattern lints) - #116723 (Fix broken build on ESP-IDF caused by #115108) - #116730 (Add some unsoundness tests for opaques capturing hidden regions not in substs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/unix/process/mod.rs')
| -rw-r--r-- | library/std/src/sys/unix/process/mod.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/process/mod.rs b/library/std/src/sys/unix/process/mod.rs index 0cf163d9fb8..947ef4c8aef 100644 --- a/library/std/src/sys/unix/process/mod.rs +++ b/library/std/src/sys/unix/process/mod.rs @@ -6,6 +6,9 @@ pub use crate::sys_common::process::CommandEnvs; #[cfg_attr(any(target_os = "espidf", target_os = "horizon"), allow(unused))] mod process_common; +#[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "vita"))] +mod process_unsupported; + cfg_if::cfg_if! { if #[cfg(target_os = "fuchsia")] { #[path = "process_fuchsia.rs"] @@ -15,8 +18,9 @@ cfg_if::cfg_if! { #[path = "process_vxworks.rs"] mod process_inner; } else if #[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "vita"))] { - #[path = "process_unsupported.rs"] - mod process_inner; + mod process_inner { + pub use super::process_unsupported::*; + } } else { #[path = "process_unix.rs"] mod process_inner; |
