bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #82456 - klensy:or-else, r=estebank

Browse source 
Replaced some unwrap_or and map_or with lazy variants

Replaced some `unwrap_or` and `map_or` with `unwrap_or_else` and `map_or_else`.
This commit is contained in:
Guillaume Gomez 2021-02-26 15:52:31 +01:00 • committed by GitHub
commit 039b1b62ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint/src/non_fmt_panic.rs
View file

@ -201,7 +201,7 @@ fn check_panic_str<'tcx>(
Some(v) if v.len() == 1 => "panic message contains a brace",
_ => "panic message contains braces",
};
cx.struct_span_lint(NON_FMT_PANIC, brace_spans.unwrap_or(vec![span]), |lint| {
cx.struct_span_lint(NON_FMT_PANIC, brace_spans.unwrap_or_else(|| vec![span]), |lint| {
let mut l = lint.build(msg);
l.note("this message is not used as a format string, but will be in Rust 2021");
if span.contains(arg.span) {