bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #80944 - LingMan:map_or, r=nagisa

Browse source 
Use Option::map_or instead of `.map(..).unwrap_or(..)`

``@rustbot`` modify labels +C-cleanup +T-compiler
This commit is contained in:
Yuki Okushi 2021-01-15 18:26:14 +09:00 • committed by GitHub
commit a584d87417
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 67 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_driver/src/lib.rs
View file

@ -1236,7 +1236,7 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
}
// If backtraces are enabled, also print the query stack
let backtrace = env::var_os("RUST_BACKTRACE").map(|x| &x != "0").unwrap_or(false);
let backtrace = env::var_os("RUST_BACKTRACE").map_or(false, |x| &x != "0");
let num_frames = if backtrace { None } else { Some(2) };