diff options
| author | Christiaan Dirkx <christiaan@dirkx.email> | 2021-04-21 16:06:32 +0200 |
|---|---|---|
| committer | Christiaan Dirkx <christiaan@dirkx.email> | 2021-04-21 16:06:32 +0200 |
| commit | aa46f08abde35740fc41b0e4f2d83d38b597a3d5 (patch) | |
| tree | 47a004a39d2e4fc7269503807a18806a5f0ce0b4 | |
| parent | 9bd9cbb28e6fafdc5835fe0c5d496bbaea8504e8 (diff) | |
| download | rust-aa46f08abde35740fc41b0e4f2d83d38b597a3d5.tar.gz rust-aa46f08abde35740fc41b0e4f2d83d38b597a3d5.zip | |
Apply suggestions from code review
| -rw-r--r-- | library/std/src/sys/unix/process/process_common.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/unix/process/process_vxworks.rs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/process/process_common.rs b/library/std/src/sys/unix/process/process_common.rs index 1ef6df0fe95..b9dcc4e4b9e 100644 --- a/library/std/src/sys/unix/process/process_common.rs +++ b/library/std/src/sys/unix/process/process_common.rs @@ -223,7 +223,7 @@ impl Command { pub fn get_groups(&self) -> Option<&[gid_t]> { self.groups.as_deref() } - #[allow(dead_code)] + pub fn get_closures(&mut self) -> &mut Vec<Box<dyn FnMut() -> io::Result<()> + Send + Sync>> { &mut self.closures } diff --git a/library/std/src/sys/unix/process/process_vxworks.rs b/library/std/src/sys/unix/process/process_vxworks.rs index 68467da284f..eecdb624b9c 100644 --- a/library/std/src/sys/unix/process/process_vxworks.rs +++ b/library/std/src/sys/unix/process/process_vxworks.rs @@ -18,7 +18,6 @@ impl Command { needs_stdin: bool, ) -> io::Result<(Process, StdioPipes)> { use crate::sys::cvt_r; - // const CLOEXEC_MSG_FOOTER: &'static [u8] = b"NOEX"; let envp = self.capture_env(); if self.saw_nul() { @@ -61,6 +60,9 @@ impl Command { t!(cvt(libc::chdir(cwd.as_ptr()))); } + // pre_exec closures are ignored on VxWorks + let _ = self.get_closures(); + let c_envp = envp .as_ref() .map(|c| c.as_ptr()) |