bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Small improvements in lexical_region_resolve

Browse source
This commit is contained in:
Andre Bogus 2020-01-08 21:12:21 +01:00
parent ed6468da16
commit 74ea108b47
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc/infer/lexical_region_resolve/mod.rs
View file

@ -204,9 +204,7 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
// want to stop at the first constraint that makes a change.
let mut any_changed = false;
for member_constraint in &self.data.member_constraints {
if self.enforce_member_constraint(graph, member_constraint, var_values) {
any_changed = true;
}
any_changed |= self.enforce_member_constraint(graph, member_constraint, var_values);
}
any_changed
}
@ -337,9 +335,7 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
for index in live_indices.iter() {
let constraint = constraints[index];
let (edge_changed, retain) = process_constraint(constraint);
if edge_changed {
changed = true;
}
changed |= edge_changed;
if !retain {
let changed = killed_indices.insert(index);
debug_assert!(changed);