generate prefixes for place

Author: csmoe

src/librustc/mir/tcx.rs

@@ -317,9 +317,6 @@ impl<'tcx> NeoPlace<'tcx> {
         tcx: TyCtxt<'cx, 'gcx, 'tcx>,
         elem_index: usize,
     ) -> Self {
-        // only works for place with projections
-        assert!(!self.elems.is_empty());
-
         if elem_index < 1 {
             // Base.[a]
             //       ^-- elems[0]
@@ -335,6 +332,20 @@ impl<'tcx> NeoPlace<'tcx> {
         }
     }
 
+    pub fn prefixes<'cx, 'gcx>(
+        &self,
+        tcx: TyCtxt<'cx, 'gcx, 'tcx>,
+    ) -> Vec<Self> {
+        // only works for place with projections
+        assert!(!self.elems.is_empty());
+
+        self.elems
+            .iter()
+            .enumerate()
+            .map(|(elem_index, _)| self.prefix(tcx, elem_index))
+            .collect::<Vec<NeoPlace<'tcx>>>()
+    }
+
     // Generate types of sub-places
     //
     // Base.[a, b]

src/librustc_mir/borrow_check/borrow_set.rs

@@ -8,13 +8,6 @@ use rustc::mir::visit::{
 };
 use rustc::mir::{self, Location, Mir, Local};
 use rustc::ty::{RegionVid, TyCtxt};
-<<<<<<< HEAD
-||||||| merged common ancestors
-use rustc::mir::PlaceBase;
-use rustc::ty::{RegionVid, TyCtxt};
-=======
-use rustc::mir::PlaceBase;
->>>>>>> generate tys of sub-places
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_data_structures::indexed_vec::IndexVec;
 use rustc_data_structures::bit_set::BitSet;