diff options
| author | Colin Wallace <colin@mooooo.ooo> | 2018-07-23 22:00:51 -0700 |
|---|---|---|
| committer | Colin Wallace <colin@mooooo.ooo> | 2018-07-23 22:00:51 -0700 |
| commit | 4f3ab4986ec96d9c93f34dc53d0a4a1279288451 (patch) | |
| tree | 84562f083ddc0648dd85547308e6ece0ff56bed9 /src/libstd/sys_common | |
| parent | 8dbbd81f7ed83943b870407ef44aecf6664e7679 (diff) | |
| download | rust-4f3ab4986ec96d9c93f34dc53d0a4a1279288451.tar.gz rust-4f3ab4986ec96d9c93f34dc53d0a4a1279288451.zip | |
libstd: Prefer `Option::map`/etc over `match` where applicable
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, |