diff options
| author | bors <bors@rust-lang.org> | 2021-03-27 16:34:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-27 16:34:59 +0000 |
| commit | afaf33dcafe9c7068b63eb997df221aa08db7c29 (patch) | |
| tree | 2bd2416c2a6dcbdf410e6d9f932960b124cb576a /library/std/src/sys/unix | |
| parent | 101003881418d23fee3fcb1b1721a216a366f2da (diff) | |
| parent | 1ad7c52812b336c23d86bc4c74c408fe5c850761 (diff) | |
| download | rust-afaf33dcafe9c7068b63eb997df221aa08db7c29.tar.gz rust-afaf33dcafe9c7068b63eb997df221aa08db7c29.zip | |
Auto merge of #83573 - JohnTitor:rollup-28jnzsr, r=JohnTitor
Rollup of 10 pull requests
Successful merges:
- #79399 (Use detailed and shorter fs error explaination)
- #83348 (format macro argument parsing fix)
- #83462 (ExitStatus: print "exit status: {}" rather than "exit code: {}" on unix)
- #83526 (lazily calls some fns)
- #83558 (Use DebugStruct::finish_non_exhaustive() in std.)
- #83559 (Fix Debug implementation for RwLock{Read,Write}Guard.)
- #83560 (Derive Debug for io::Chain instead of manually implementing it.)
- #83561 (Improve Debug implementations of Mutex and RwLock.)
- #83567 (Update rustup cross-compilation docs link)
- #83569 (Add regression tests for #56445)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/unix')
| -rw-r--r-- | library/std/src/sys/unix/process/process_unix.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/unix/process/process_unix/tests.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs index 01f1318fe80..53916cb9abd 100644 --- a/library/std/src/sys/unix/process/process_unix.rs +++ b/library/std/src/sys/unix/process/process_unix.rs @@ -535,7 +535,7 @@ impl From<c_int> for ExitStatus { impl fmt::Display for ExitStatus { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(code) = self.code() { - write!(f, "exit code: {}", code) + write!(f, "exit status: {}", code) } else if let Some(signal) = self.signal() { if self.core_dumped() { write!(f, "signal: {} (core dumped)", signal) diff --git a/library/std/src/sys/unix/process/process_unix/tests.rs b/library/std/src/sys/unix/process/process_unix/tests.rs index 5819d2c2a5a..02c469fbcdf 100644 --- a/library/std/src/sys/unix/process/process_unix/tests.rs +++ b/library/std/src/sys/unix/process/process_unix/tests.rs @@ -9,8 +9,8 @@ fn exitstatus_display_tests() { t(0x0000f, "signal: 15"); t(0x0008b, "signal: 11 (core dumped)"); - t(0x00000, "exit code: 0"); - t(0x0ff00, "exit code: 255"); + t(0x00000, "exit status: 0"); + t(0x0ff00, "exit status: 255"); // On MacOS, 0x0137f is WIFCONTINUED, not WIFSTOPPED. Probably *BSD is similar. // https://github.com/rust-lang/rust/pull/82749#issuecomment-790525956 |