various small fixes

src/borrows/borrows_graph.rs

@@ -316,10 +316,15 @@ impl<'tcx> BorrowsGraph<'tcx> {
         });
     }
 
-    fn mut_maybe_old_places(&mut self, mut f: impl FnMut(&mut MaybeOldPlace<'tcx>) -> bool) -> bool {
+    fn mut_maybe_old_places(
+        &mut self,
+        mut f: impl FnMut(&mut MaybeOldPlace<'tcx>) -> bool,
+    ) -> bool {
         self.mut_edges(|edge| {
             let maybe_old_places: Vec<&mut MaybeOldPlace<'tcx>> = match edge.mut_kind() {
-                BorrowsEdgeKind::Reborrow(reborrow) => vec![&mut reborrow.blocked_place, &mut reborrow.assigned_place],
+                BorrowsEdgeKind::Reborrow(reborrow) => {
+                    vec![&mut reborrow.blocked_place, &mut reborrow.assigned_place]
+                }
                 BorrowsEdgeKind::DerefExpansion(de) => vec![de.mut_base()],
                 BorrowsEdgeKind::RegionAbstraction(ra) => ra.maybe_old_places(),
                 BorrowsEdgeKind::RegionProjectionMember(_) => todo!(),
@@ -385,7 +390,6 @@ impl<'tcx, T: ToJsonWithRepacker<'tcx>> ToJsonWithRepacker<'tcx> for Conditioned
 }
 
 impl<'tcx> BorrowsEdge<'tcx> {
-
     /// true iff any of the blocked places can be mutated via the blocking places
     pub fn is_shared_borrow(&self) -> bool {
         self.kind.is_shared_borrow()
@@ -495,7 +499,9 @@ impl<'tcx> BorrowsEdgeKind<'tcx> {
             BorrowsEdgeKind::DerefExpansion(de) => de.expansion(repacker).into_iter().collect(),
             BorrowsEdgeKind::RegionAbstraction(ra) => ra.blocked_by_places(),
             BorrowsEdgeKind::RegionProjectionMember(member) => match member.direction {
-                RegionProjectionMemberDirection::PlaceIsRegionInput => FxHashSet::default(),
+                RegionProjectionMemberDirection::PlaceIsRegionInput => {
+                    vec![member.projection.place].into_iter().collect()
+                }
                 RegionProjectionMemberDirection::PlaceIsRegionOutput => {
                     vec![member.place].into_iter().collect()
                 }

src/borrows/borrows_state.rs

@@ -35,19 +35,24 @@ pub enum RegionProjectionMemberDirection {
 pub struct RegionProjectionMember<'tcx> {
     pub place: MaybeOldPlace<'tcx>,
     pub projection: RegionProjection<'tcx>,
-    pub location: Location,
+    location: Location,
     pub direction: RegionProjectionMemberDirection,
 }
 
 impl<'tcx> RegionProjectionMember<'tcx> {
     pub fn make_place_old(&mut self, place: Place<'tcx>, latest: &Latest<'tcx>) {
         self.place.make_place_old(place, latest);
+        self.projection.make_place_old(place, latest);
     }
 
     pub fn projection_index(&self, repacker: PlaceRepacker<'_, 'tcx>) -> usize {
         self.projection.index(repacker)
     }
 
+    pub fn location(&self) -> Location {
+        self.location
+    }
+
     pub fn new(
         place: MaybeOldPlace<'tcx>,
         projection: RegionProjection<'tcx>,

src/borrows/borrows_visitor.rs

@@ -452,7 +452,7 @@ impl<'tcx, 'mir, 'state> Visitor<'tcx> for BorrowsVisitor<'tcx, 'mir, 'state> {
                     self.state.after.set_latest((*target).into(), location);
                     match rvalue {
                         Rvalue::Aggregate(box kind, fields) => match kind {
-                            AggregateKind::Adt(_def_id, _variant_idx, _substs, _, _) => {
+                            AggregateKind::Adt(..) | AggregateKind::Tuple => {
                                 let target: utils::Place<'tcx> = (*target).into();
                                 for (_idx, field) in fields.iter_enumerated() {
                                     match field.ty(self.body, self.tcx).kind() {

src/borrows/domain.rs

@@ -459,6 +459,7 @@ impl<'tcx> RegionProjection<'tcx> {
         Self { place, region }
     }
     pub fn make_place_old(&mut self, place: Place<'tcx>, latest: &Latest<'tcx>) {
+        eprintln!("[projection] make_place_old {:?} {:?}", place, self.place);
         self.place.make_place_old(place, latest);
     }
     pub fn index(&self, repacker: PlaceRepacker<'_, 'tcx>) -> usize {