mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge if and match expressions that don't make sense to have separated

Browse source
This commit is contained in:
Santiago Pastorino 2023-08-26 13:37:43 -03:00
parent e2efb6ab29
commit b92840accf
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs
View file

@ -214,7 +214,7 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
true
}
VarValue::Value(cur_region) => {
let lub = match *cur_region {
match *cur_region {
// If this empty region is from a universe that can name the
// placeholder universe, then the LUB is the Placeholder region
// (which is the cur_region). Otherwise, the LUB is the Static
@ -222,22 +222,17 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
RePlaceholder(placeholder)
if !a_universe.can_name(placeholder.universe) =>
{
self.tcx().lifetimes.re_static
let lub = self.tcx().lifetimes.re_static;
debug!(
"Expanding value of {:?} from {:?} to {:?}",
b_vid, cur_region, lub
);
*b_data = VarValue::Value(lub);
true
}
_ => cur_region,
};
if lub == cur_region {
false
} else {
debug!(
"Expanding value of {:?} from {:?} to {:?}",
b_vid, cur_region, lub
);
*b_data = VarValue::Value(lub);
true
_ => false,
}
}