diff options
| author | bors <bors@rust-lang.org> | 2020-07-19 14:17:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-19 14:17:08 +0000 |
| commit | d7f94516345a36ddfcd68cbdf1df835d356795c3 (patch) | |
| tree | bea3e4ab40d0c1eaf79c02d717cf8f5be4d3366f /src/libstd/sys | |
| parent | 48036804d2bc461b243c5d291b850e44bcca68ef (diff) | |
| parent | 1636961a0e02adb7a1200d98a3c94f68decd3a13 (diff) | |
| download | rust-d7f94516345a36ddfcd68cbdf1df835d356795c3.tar.gz rust-d7f94516345a36ddfcd68cbdf1df835d356795c3.zip | |
Auto merge of #74518 - Manishearth:rollup-jfmnh1r, r=Manishearth
Rollup of 4 pull requests Successful merges: - #74333 (Deny unsafe operations in unsafe functions in libstd/alloc.rs) - #74356 (Remove combine function) - #74419 (Add a thumbv4t-none-eabi target) - #74485 (More intra-doc links, add explicit exception list to linkchecker) Failed merges: - #74486 (Improve Read::read_exact documentation) r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/process/process_unix.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/libstd/sys/unix/process/process_unix.rs b/src/libstd/sys/unix/process/process_unix.rs index 371291b9f76..0f349dfa302 100644 --- a/src/libstd/sys/unix/process/process_unix.rs +++ b/src/libstd/sys/unix/process/process_unix.rs @@ -84,12 +84,12 @@ impl Command { Ok(0) => return Ok((p, ours)), Ok(8) => { let (errno, footer) = bytes.split_at(4); - assert!( - combine(CLOEXEC_MSG_FOOTER) == combine(footer.try_into().unwrap()), + assert_eq!( + CLOEXEC_MSG_FOOTER, footer, "Validation on the CLOEXEC pipe failed: {:?}", bytes ); - let errno = combine(errno.try_into().unwrap()); + let errno = i32::from_be_bytes(errno.try_into().unwrap()); assert!(p.wait().is_ok(), "wait() should either return Ok or panic"); return Err(Error::from_raw_os_error(errno)); } @@ -105,10 +105,6 @@ impl Command { } } } - - fn combine(arr: [u8; 4]) -> i32 { - i32::from_be_bytes(arr) - } } pub fn exec(&mut self, default: Stdio) -> io::Error { |
