---

yaml
---
r: 147667
b: refs/heads/try2
c: 211c6d5
h: refs/heads/master
i:
  147665: 33c30b0
  147663: 2011be8
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2ba1b0bc0682235293c963d5638a8306acdfa097
+refs/heads/try2: 211c6d522b727f0e29994d84a7d53bb7b0d68bcd
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/borrowck/move_data.rs

@@ -15,7 +15,6 @@ comments in the section "Moves and initialization" and in `doc.rs`.
 
 */
 
-
 use std::hashmap::{HashMap, HashSet};
 use std::uint;
 use middle::borrowck::*;
@@ -174,6 +173,10 @@ impl MoveData {
         }
     }
 
+    fn path_loan_path(&self, index: MovePathIndex) -> @LoanPath {
+        self.paths[*index].loan_path
+    }
+
     fn path<'a>(&'a self, index: MovePathIndex) -> &'a MovePath {
         //! Type safe indexing operator
         &self.paths[*index]
@@ -400,7 +403,7 @@ impl MoveData {
 
         // Kill all assignments when the variable goes out of scope:
         for (assignment_index, assignment) in self.var_assignments.iter().enumerate() {
-            match *self.path(assignment.path).loan_path {
+            match *self.path_loan_path(assignment.path) {
                 LpVar(id) => {
                     let kill_id = tcx.region_maps.encl_scope(id);
                     dfcx_assign.add_kill(kill_id, assignment_index);
@@ -514,7 +517,7 @@ impl FlowedMoveData {
         self.dfcx_moves.each_gen_bit_frozen(id, |index| {
             let move = &self.move_data.moves[index];
             let moved_path = move.path;
-            f(move, self.move_data.path(moved_path).loan_path)
+            f(move, self.move_data.path_loan_path(moved_path))
         })
     }
 
@@ -555,7 +558,7 @@ impl FlowedMoveData {
             if base_indices.iter().any(|x| x == &moved_path) {
                 // Scenario 1 or 2: `loan_path` or some base path of
                 // `loan_path` was moved.
-                if !f(move, self.move_data.path(moved_path).loan_path) {
+                if !f(move, self.move_data.path_loan_path(moved_path)) {
                     ret = false;
                 }
             } else {
@@ -564,7 +567,7 @@ impl FlowedMoveData {
                         if p == loan_path_index {
                             // Scenario 3: some extension of `loan_path`
                             // was moved
-                            f(move, self.move_data.path(moved_path).loan_path)
+                            f(move, self.move_data.path_loan_path(moved_path))
                         } else {
                             true
                         }