Refactoring

[zgrannan]

Too many refactorings to count

[zgrannan]

@Aurel300 let me know when you have Prusti working using the latest version of this branch, I'll merge it into master

[Aurel300]

@zgrannan I think it all works, but I still need this patch:

--- a/src/borrow_pcg/borrow_pcg_expansion.rs
+++ b/src/borrow_pcg/borrow_pcg_expansion.rs
@@ -34,7 +34,7 @@ use crate::{
 /// *x.f.b}
 #[derive(PartialEq, Eq, Clone, Debug, Hash)]
 pub struct ExpansionOfBorrowed<'tcx, P = LocalNode<'tcx>> {
-    pub(crate) base: P,
+    pub base: P,
     pub(crate) expansion: BorrowExpansion<'tcx>,
 }

Or should I be accessing this field differently? I use this field when processing BorrowPCGExpansions to emit folds/unfolds.

[zgrannan]

@zgrannan I think it all works, but I still need this patch:

--- a/src/borrow_pcg/borrow_pcg_expansion.rs
+++ b/src/borrow_pcg/borrow_pcg_expansion.rs
@@ -34,7 +34,7 @@ use crate::{
 /// *x.f.b}
 #[derive(PartialEq, Eq, Clone, Debug, Hash)]
 pub struct ExpansionOfBorrowed<'tcx, P = LocalNode<'tcx>> {
-    pub(crate) base: P,
+    pub base: P,
     pub(crate) expansion: BorrowExpansion<'tcx>,
 }

Or should I be accessing this field differently? I use this field when processing BorrowPCGExpansions to emit folds/unfolds.

I just added a .base() method for ExpansioOfBorrowed, so you can use that

pcg/src/borrow_pcg/borrow_pcg_expansion.rs

Lines 174 to 178 in 06c211c

	impl<P: Copy> ExpansionOfBorrowed<'_, P> {
	pub fn base(&self) -> P {
	self.base
	}
	}