diff --git a/polonius-engine/src/output/datafrog_opt.rs b/polonius-engine/src/output/datafrog_opt.rs index 5cc9c27cd3..564696c304 100644 --- a/polonius-engine/src/output/datafrog_opt.rs +++ b/polonius-engine/src/output/datafrog_opt.rs @@ -403,7 +403,7 @@ pub(super) fn compute( let origin_contains_loan_on_entry_op = origin_contains_loan_on_entry_op.complete(); for &((origin, location), loan) in origin_contains_loan_on_entry_op.iter() { result - .restricts + .origin_contains_loan_at .entry(location) .or_default() .entry(origin) diff --git a/polonius-engine/src/output/location_insensitive.rs b/polonius-engine/src/output/location_insensitive.rs index 866b003137..8a975f8575 100644 --- a/polonius-engine/src/output/location_insensitive.rs +++ b/polonius-engine/src/output/location_insensitive.rs @@ -101,7 +101,7 @@ pub(super) fn compute( let origin_contains_loan_on_entry = origin_contains_loan_on_entry.complete(); for &(origin, loan) in origin_contains_loan_on_entry.iter() { result - .restricts_anywhere + .origin_contains_loan_anywhere .entry(origin) .or_default() .insert(loan); diff --git a/polonius-engine/src/output/mod.rs b/polonius-engine/src/output/mod.rs index ac2f46c567..610bf7d1d7 100644 --- a/polonius-engine/src/output/mod.rs +++ b/polonius-engine/src/output/mod.rs @@ -83,8 +83,8 @@ pub struct Output { // these are just for debugging pub loan_live_at: FxHashMap>, - pub restricts: FxHashMap>>, - pub restricts_anywhere: FxHashMap>, + pub origin_contains_loan_at: FxHashMap>>, + pub origin_contains_loan_anywhere: FxHashMap>, pub origin_live_on_entry: FxHashMap>, pub loan_invalidated_at: FxHashMap>, pub subset: FxHashMap>>, @@ -403,8 +403,8 @@ impl Output { subset_errors: FxHashMap::default(), dump_enabled, loan_live_at: FxHashMap::default(), - restricts: FxHashMap::default(), - restricts_anywhere: FxHashMap::default(), + origin_contains_loan_at: FxHashMap::default(), + origin_contains_loan_anywhere: FxHashMap::default(), origin_live_on_entry: FxHashMap::default(), loan_invalidated_at: FxHashMap::default(), move_errors: FxHashMap::default(), @@ -426,25 +426,25 @@ impl Output { } } - pub fn borrows_in_scope_at(&self, location: T::Point) -> &[T::Loan] { + pub fn loans_in_scope_at(&self, location: T::Point) -> &[T::Loan] { match self.loan_live_at.get(&location) { Some(p) => p, None => &[], } } - pub fn restricts_at( + pub fn origin_contains_loan_at( &self, location: T::Point, ) -> Cow<'_, BTreeMap>> { assert!(self.dump_enabled); - match self.restricts.get(&location) { + match self.origin_contains_loan_at.get(&location) { Some(map) => Cow::Borrowed(map), None => Cow::Owned(BTreeMap::default()), } } - pub fn regions_live_at(&self, location: T::Point) -> &[T::Origin] { + pub fn origins_live_at(&self, location: T::Point) -> &[T::Origin] { assert!(self.dump_enabled); match self.origin_live_on_entry.get(&location) { Some(v) => v, diff --git a/polonius-engine/src/output/naive.rs b/polonius-engine/src/output/naive.rs index b3dd73b2f2..31156ee71a 100644 --- a/polonius-engine/src/output/naive.rs +++ b/polonius-engine/src/output/naive.rs @@ -240,7 +240,7 @@ pub(super) fn compute( let origin_contains_loan_on_entry = origin_contains_loan_on_entry.complete(); for &(origin, loan, location) in origin_contains_loan_on_entry.iter() { result - .restricts + .origin_contains_loan_at .entry(location) .or_default() .entry(origin) diff --git a/src/dump.rs b/src/dump.rs index 12fe4341f4..6db5a461ba 100644 --- a/src/dump.rs +++ b/src/dump.rs @@ -41,8 +41,8 @@ pub(crate) fn dump_output( if output.dump_enabled { dump_output_fields![ - restricts, - restricts_anywhere, + origin_contains_loan_at, + origin_contains_loan_anywhere, origin_live_on_entry, loan_invalidated_at, loan_live_at, @@ -434,9 +434,9 @@ fn build_outputs_by_point_for_visualization( intern, ), facts_by_point( - output.restricts.iter(), + output.origin_contains_loan_at.iter(), |(point, origin_to_loans)| (*point, origin_to_loans.clone()), - "restricts".to_string(), + "origin_contains_loan_at".to_string(), 0, intern, ),