diff options
| -rw-r--r-- | src/librustc_mir/borrow_check/nll/facts.rs | 5 | ||||
| -rw-r--r-- | src/librustc_mir/borrow_check/nll/mod.rs | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/librustc_mir/borrow_check/nll/facts.rs b/src/librustc_mir/borrow_check/nll/facts.rs index 10ce3a099cf..9458b24f07d 100644 --- a/src/librustc_mir/borrow_check/nll/facts.rs +++ b/src/librustc_mir/borrow_check/nll/facts.rs @@ -65,9 +65,8 @@ impl AllFactsExt for AllFacts { var_drop_used, var_uses_region, var_drops_region, - var_maybe_initialized_on_exit, - parent, - var_starts_path, + child, + path_belongs_to_var, initialized_at, moved_out_at, ]) diff --git a/src/librustc_mir/borrow_check/nll/mod.rs b/src/librustc_mir/borrow_check/nll/mod.rs index 9b920eb1559..4c76d14bdbb 100644 --- a/src/librustc_mir/borrow_check/nll/mod.rs +++ b/src/librustc_mir/borrow_check/nll/mod.rs @@ -73,10 +73,10 @@ pub(in crate::borrow_check) fn replace_regions_in_mir<'cx, 'tcx>( // This function populates an AllFacts instance with base facts related to // MovePaths and needed for the move analysis. fn populate_polonius_move_facts(all_facts: &mut AllFacts, move_data: &MoveData<'_>, location_table: &LocationTable, body: &Body<'_>) { - all_facts.var_starts_path.extend(move_data.rev_lookup.iter_locals_enumerated().map(|(v, &m)| (v, m))); + all_facts.path_belongs_to_var.extend(move_data.rev_lookup.iter_locals_enumerated().map(|(v, &m)| (m, v))); - for (idx, move_path) in move_data.move_paths.iter_enumerated() { - all_facts.parent.extend(move_path.parents(&move_data.move_paths).iter().map(|&parent| (parent, idx))); + for (child, move_path) in move_data.move_paths.iter_enumerated() { + all_facts.child.extend(move_path.parents(&move_data.move_paths).iter().map(|&parent| (child, parent))); } // initialized_at |