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_resolve/src/late/lifetimes.rs
View file

@ -1971,7 +1971,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
// Therefore, we would compute `object_lifetime_defaults` to a
// vector like `['x, 'static]`. Note that the vector only
// includes type parameters.
let object_lifetime_defaults = type_def_id.map_or(vec![], |def_id| {
let object_lifetime_defaults = type_def_id.map_or_else(Vec::new, |def_id| {
let in_body = {
let mut scope = self.scope;
loop {