diff options
| author | bors <bors@rust-lang.org> | 2018-07-25 00:31:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-25 00:31:58 +0000 |
| commit | 13985724033467ab86da9136c43fe242092b294e (patch) | |
| tree | b0f41cba1aee734fa57945896cb6044fc962a046 /src/libstd/sys_common | |
| parent | 46804ef0cee4b55ed9922719da243b6edd9101b2 (diff) | |
| parent | 1deaed9e5e5c3d0676183e5dd250574e240b5138 (diff) | |
| download | rust-13985724033467ab86da9136c43fe242092b294e.tar.gz rust-13985724033467ab86da9136c43fe242092b294e.zip | |
Auto merge of #52680 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 7 pull requests Successful merges: - #52391 (Add unaligned volatile intrinsics) - #52402 (impl PartialEq+Eq for BuildHasherDefault) - #52645 (Allow declaring existential types inside blocks) - #52656 (Stablize Redox Unix Sockets) - #52658 (Prefer `Option::map`/etc over `match` wherever it improves clarity) - #52668 (clarify pointer offset function safety concerns) - #52677 (Release notes: add some missing 1.28 libs stabilization) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/backtrace.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs index 61d7ed463dd..2db47bd5947 100644 --- a/src/libstd/sys_common/backtrace.rs +++ b/src/libstd/sys_common/backtrace.rs @@ -156,16 +156,15 @@ pub fn log_enabled() -> Option<PrintFormat> { _ => return Some(PrintFormat::Full), } - let val = match env::var_os("RUST_BACKTRACE") { - Some(x) => if &x == "0" { + let val = env::var_os("RUST_BACKTRACE").and_then(|x| + if &x == "0" { None } else if &x == "full" { Some(PrintFormat::Full) } else { Some(PrintFormat::Short) - }, - None => None, - }; + } + ); ENABLED.store(match val { Some(v) => v as isize, None => 1, |