Fix mutability capture from place

Author: csmoe

src/librustc/mir/tcx.rs

@@ -185,7 +185,7 @@ impl<'tcx> Place<'tcx> {
     //     Base.[]
     //     ^^^^ ^^-- no projection(empty)
     //     |-- base_place
-    pub fn final_projection<'cx, 'gcx>(
+    pub fn split_projection<'cx, 'gcx>(
         &self,
         tcx: TyCtxt<'cx, 'gcx, 'tcx>,
     ) -> (Place<'tcx>, Option<&'tcx PlaceElem<'tcx>>) {
@@ -216,7 +216,7 @@ impl<'tcx> Place<'tcx> {
     //     Base.[] => Base.[]
     //          ^^-- no projection
     pub fn projection_base<'cx, 'gcx>(&self, tcx: TyCtxt<'cx, 'gcx, 'tcx>) -> Place<'tcx> {
-        match self.final_projection(tcx) {
+        match self.split_projection(tcx) {
             (place, Some(_)) => place,
             (_, None) => self.clone(),
         }

src/librustc_mir/borrow_check/move_errors.rs

@@ -297,7 +297,7 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
                 // Ok to suggest a borrow, since the target can't be moved from
                 // anyway.
                 if let Ok(snippet) = self.tcx.sess.codemap().span_to_snippet(span) {
-                    if let (base_place, Some(proj)) = move_from.final_projection(self.tcx) {
+                    if let (base_place, Some(proj)) = move_from.split_projection(self.tcx) {
                         if self.suitable_to_remove_deref(&base_place, proj, &snippet) {
                             err.span_suggestion(
                                 span,

src/librustc_mir/borrow_check/mutability_errors.rs

@@ -41,7 +41,7 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
         let reason;
         let access_place_desc = self.describe_place(access_place);
 
-        if let (base_place, Some(projection)) = the_place_err.final_projection(self.tcx) {
+        if let (base_place, Some(projection)) = the_place_err.split_projection(self.tcx) {
             match projection {
                 ProjectionElem::Deref => {
                     if base_place.base == PlaceBase::Local(Local::new(1))
@@ -188,7 +188,7 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
             }
         };
 
-        if let (base_place, Some(projection)) = the_place_err.final_projection(self.tcx) {
+        if let (base_place, Some(projection)) = the_place_err.split_projection(self.tcx) {
             match projection {
                 ProjectionElem::Deref => {
                     if let PlaceBase::Local(local) = base_place.base {
@@ -360,7 +360,7 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
 
     // Does this place refer to what the user sees as an upvar
     fn is_upvar(&self, place: &Place<'tcx>) -> bool {
-        if let (base_place, Some(projection)) = place.final_projection(self.tcx) {
+        if let (base_place, Some(projection)) = place.split_projection(self.tcx) {
             match projection {
                 ProjectionElem::Field(_, _) => {
                     let base_ty = base_place.ty(self.mir, self.tcx).to_ty(self.tcx);
@@ -370,7 +370,7 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
                     if let (
                         ref base_place,
                         Some(ProjectionElem::Field(upvar_index, _)),
-                    ) = base_place.final_projection(self.tcx) {
+                    ) = base_place.split_projection(self.tcx) {
                         let base_ty = base_place.ty(self.mir, self.tcx).to_ty(self.tcx);
                         is_closure_or_generator(base_ty)
                             && self.mir.upvar_decls[upvar_index.index()].by_ref