about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndre Bogus <bogusandre@gmail.com>2020-01-08 21:12:21 +0100
committerAndre Bogus <bogusandre@gmail.com>2020-01-08 23:00:33 +0100
commit74ea108b47997db75147f8af9b74119ee341ecbd (patch)
tree314d8d640852694b135254dfc69c7d3983c27727
parented6468da160bd67a2ce0573427f09a98daff8c07 (diff)
downloadrust-74ea108b47997db75147f8af9b74119ee341ecbd.tar.gz
rust-74ea108b47997db75147f8af9b74119ee341ecbd.zip
Small improvements in lexical_region_resolve
-rw-r--r--src/librustc/infer/lexical_region_resolve/mod.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/librustc/infer/lexical_region_resolve/mod.rs b/src/librustc/infer/lexical_region_resolve/mod.rs
index e78382c0a32..0bc49a29015 100644
--- a/src/librustc/infer/lexical_region_resolve/mod.rs
+++ b/src/librustc/infer/lexical_region_resolve/mod.rs
@@ -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);