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/test/src/helpers/exit_code.rs | |
| 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/test/src/helpers/exit_code.rs')
| -rw-r--r-- | library/test/src/helpers/exit_code.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/test/src/helpers/exit_code.rs b/library/test/src/helpers/exit_code.rs index 31e234d9818..50bb260762a 100644 --- a/library/test/src/helpers/exit_code.rs +++ b/library/test/src/helpers/exit_code.rs @@ -4,7 +4,7 @@ use std::process::ExitStatus; #[cfg(not(unix))] pub fn get_exit_code(status: ExitStatus) -> Result<i32, String> { - status.code().ok_or("received no exit code from child process".into()) + status.code().ok_or_else(|| "received no exit code from child process".into()) } #[cfg(unix)] |