Make some more changes

src/borrow_pcg/action/actions.rs

@@ -43,7 +43,7 @@ impl<'tcx> BorrowPCGActions<'tcx> {
                             ..
                         },
                     ..
-                } => Some(Conditioned::new(edge.clone(), conditions.clone())),
+                } => Some(Conditioned::new(*edge, conditions.clone())),
                 _ => None,
             })
             .collect()

src/borrow_pcg/domain.rs

@@ -165,7 +165,7 @@ impl<'mir, 'tcx> BorrowsDomain<'mir, 'tcx> {
     fn introduce_initial_borrows(&mut self, local: Local) {
         let local_decl = &self.repacker.body().local_decls[local];
         let arg_place: Place<'tcx> = local.into();
-        if let ty::TyKind::Ref(region, _, mutability) = local_decl.ty.kind() {
+        if let ty::TyKind::Ref(_, _, mutability) = local_decl.ty.kind() {
             let entry_state = Rc::<BorrowsState<'tcx>>::make_mut(&mut self.data.entry_state);
             assert!(entry_state.set_capability(
                 MaybeRemotePlace::place_assigned_to_local(local).into(),

src/borrow_pcg/edge/borrow.rs

@@ -107,7 +107,7 @@ impl<'tcx> EdgeData<'tcx> for RemoteBorrow<'tcx> {
     }
 }
 
-impl<'tcx> RemoteBorrow<'tcx> {
+impl RemoteBorrow<'_> {
     pub(crate) fn new(local: mir::Local) -> Self {
         Self {
             local,
@@ -156,7 +156,7 @@ impl<'tcx> BorrowEdge<'tcx> {
     ) -> RegionProjection<'tcx, MaybeOldPlace<'tcx>> {
         match self {
             BorrowEdge::Local(borrow) => borrow.assigned_region_projection(repacker),
-            BorrowEdge::Remote(borrow) => borrow.assigned_region_projection(repacker).into(),
+            BorrowEdge::Remote(borrow) => borrow.assigned_region_projection(repacker),
         }
     }
 
@@ -170,14 +170,14 @@ impl<'tcx> BorrowEdge<'tcx> {
     pub fn deref_place(&self, repacker: PlaceRepacker<'_, 'tcx>) -> MaybeOldPlace<'tcx> {
         match self {
             BorrowEdge::Local(borrow) => borrow.deref_place(repacker),
-            BorrowEdge::Remote(borrow) => borrow.deref_place(repacker).into(),
+            BorrowEdge::Remote(borrow) => borrow.deref_place(repacker),
         }
     }
 
     pub(crate) fn assigned_ref(&self) -> MaybeOldPlace<'tcx> {
         match self {
             BorrowEdge::Local(borrow) => borrow.assigned_ref,
-            BorrowEdge::Remote(remote) => remote.assigned_ref().into(),
+            BorrowEdge::Remote(remote) => remote.assigned_ref()
         }
     }
 }

src/borrow_pcg/edge/mod.rs

@@ -1,5 +1,4 @@
 pub mod abstraction;
-pub mod block;
 pub mod borrow;
 pub mod kind;
 pub mod outlives;

src/borrow_pcg/edge/region_projection_member.rs

@@ -13,6 +13,7 @@ use crate::{
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub(crate) enum RpMemberDirection {
     PlaceOutlivesRegion,
+    #[allow(dead_code)]
     RegionOutlivesPlace,
 }
 
@@ -78,6 +79,10 @@ impl<'tcx> RegionProjectionMember<'tcx> {
             }
         }
     }
+
+    pub(crate) fn direction(&self) -> RpMemberDirection {
+        self.direction
+    }
 }
 
 impl<'tcx> EdgeData<'tcx> for RegionProjectionMember<'tcx> {

src/borrow_pcg/state/obtain.rs

@@ -11,7 +11,7 @@ use crate::borrow_pcg::unblock_graph::UnblockGraph;
 use crate::combined_pcs::{PCGError, PCGNodeLike};
 use crate::free_pcs::CapabilityKind;
 use crate::rustc_interface::middle::mir::{BorrowKind, Location, MutBorrowKind};
-use crate::rustc_interface::middle::ty::{Mutability};
+use crate::rustc_interface::middle::ty::Mutability;
 use crate::utils::maybe_old::MaybeOldPlace;
 use crate::utils::{Place, PlaceRepacker};
 use crate::visualization::dot_graph::DotGraph;

src/utils/place/maybe_old.rs

@@ -220,7 +220,7 @@ impl<'tcx> MaybeOldPlace<'tcx> {
     ) -> Option<RegionProjection<'tcx, Self>> {
         self.place()
             .base_region_projection(repacker)
-            .map(|rp| rp.set_base((*self).into(), repacker))
+            .map(|rp| rp.set_base(*self, repacker))
     }
 
     pub(crate) fn is_owned(&self, repacker: PlaceRepacker<'_, 'tcx>) -> bool {

src/utils/place/remote.rs

@@ -4,7 +4,7 @@ use crate::borrow_pcg::region_projection::{
 use crate::borrow_pcg::visitor::extract_regions;
 use crate::combined_pcs::{PCGNode, PCGNodeLike};
 use crate::rustc_interface::index::IndexVec;
-use crate::rustc_interface::middle::{mir, ty::TyCtxt};
+use crate::rustc_interface::middle::mir;
 use crate::utils::display::DisplayWithRepacker;
 use crate::utils::json::ToJsonWithRepacker;
 use crate::utils::validity::HasValidityCheck;
@@ -15,16 +15,6 @@ pub struct RemotePlace {
     pub(crate) local: mir::Local,
 }
 
-impl RemotePlace {
-    pub(crate) fn deref_place<'tcx>(&self, tcx: TyCtxt<'tcx>) -> Place<'tcx> {
-        let place: Place<'_> = self.local.into();
-        place
-        .0
-            .project_deeper(&[mir::ProjectionElem::Deref], tcx)
-            .into()
-    }
-}
-
 impl<'tcx> ToJsonWithRepacker<'tcx> for RemotePlace {
     fn to_json(&self, _repacker: PlaceRepacker<'_, 'tcx>) -> serde_json::Value {
         todo!()

src/visualization/graph_constructor.rs

@@ -368,7 +368,15 @@ trait PlaceGrapher<'mir, 'tcx: 'mir> {
                     kind: format!("{}", member.kind),
                 });
             }
-            BorrowPCGEdgeKind::RegionProjectionMember(region_projection_member) => todo!(),
+            BorrowPCGEdgeKind::RegionProjectionMember(member) => {
+                let input_node = self.insert_pcg_node(member.blocked_node());
+                let output_node = self.insert_local_node(member.blocked_by_node(self.repacker()));
+                self.constructor().edges.insert(GraphEdge::Block {
+                    source: input_node,
+                    target: output_node,
+                    kind: format!("{:?}", member.direction()),
+                });
+            }
         }
     }
 }