about summary refs log tree commit diff
path: root/library/std/src/sys/unix/process/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-04-22 05:01:30 +0000
committerbors <bors@rust-lang.org>2021-04-22 05:01:30 +0000
commit71965ab4d05b023cd29c914ef1262a72cac02e01 (patch)
treebc5c5084c6c21d76871f0ab6e40825ebfeaeed51 /library/std/src/sys/unix/process/mod.rs
parentc757729701e3d065e3ad6a9bf9f15ab206633c51 (diff)
parent268d29d75d4ba1839e1c288cb7bd594e8bb9662f (diff)
downloadrust-71965ab4d05b023cd29c914ef1262a72cac02e01.tar.gz
rust-71965ab4d05b023cd29c914ef1262a72cac02e01.zip
Auto merge of #84411 - m-ou-se:rollup-9btsp2t, r=m-ou-se
Rollup of 12 pull requests

Successful merges:

 - #84013 (Replace all `fmt.pad` with `debug_struct`)
 - #84119 (Move `sys::vxworks` code to `sys::unix`)
 - #84212 (Replace `Void` in `sys` with never type)
 - #84251 (fix 'const-stable since' for NonZeroU*::new_unchecked)
 - #84301 (Document that `index` and `index_mut` can panic)
 - #84365 (Improve the docstrings of the `Lto` struct.)
 - #84378 (Fix broken doc link)
 - #84379 (Add GAT related tests)
 - #84380 (Write Rustdoc titles like "x in crate::mod - Rust")
 - #84390 (Format `Struct { .. }` on one line even with `{:#?}`.)
 - #84393 (Support `x.py doc std --open`)
 - #84406 (Remove `delete` alias from `mem::drop`.)

Failed merges:

 - #84387 (Move `sys_common::poison` to `sync::poison`)

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.rs22
1 files changed, 14 insertions, 8 deletions
diff --git a/library/std/src/sys/unix/process/mod.rs b/library/std/src/sys/unix/process/mod.rs
index 1b7b93f9d4a..f67c70c0177 100644
--- a/library/std/src/sys/unix/process/mod.rs
+++ b/library/std/src/sys/unix/process/mod.rs
@@ -4,11 +4,17 @@ pub use crate::ffi::OsString as EnvKey;
 pub use crate::sys_common::process::CommandEnvs;
 
 mod process_common;
-#[cfg(not(target_os = "fuchsia"))]
-#[path = "process_unix.rs"]
-mod process_inner;
-#[cfg(target_os = "fuchsia")]
-#[path = "process_fuchsia.rs"]
-mod process_inner;
-#[cfg(target_os = "fuchsia")]
-mod zircon;
+
+cfg_if::cfg_if! {
+    if #[cfg(target_os = "fuchsia")] {
+        #[path = "process_fuchsia.rs"]
+        mod process_inner;
+        mod zircon;
+    } else if #[cfg(target_os = "vxworks")] {
+        #[path = "process_vxworks.rs"]
+        mod process_inner;
+    } else {
+        #[path = "process_unix.rs"]
+        mod process_inner;
+    }
+}