---

yaml
---
r: 94716
b: refs/heads/try
c: f19a9b9
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 211c6d522b727f0e29994d84a7d53bb7b0d68bcd
+refs/heads/try: f19a9b96004d04ae885de30cbc4f88e214a87fb8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -177,6 +177,10 @@ impl MoveData {
         self.paths[*index].loan_path
     }
 
+    fn path_parent(&self, index: MovePathIndex) -> MovePathIndex {
+        self.paths[*index].parent
+    }
+
     fn path<'a>(&'a self, index: MovePathIndex) -> &'a MovePath {
         //! Type safe indexing operator
         &self.paths[*index]
@@ -194,7 +198,7 @@ impl MoveData {
 
     fn is_var_path(&self, index: MovePathIndex) -> bool {
         //! True if `index` refers to a variable
-        self.path(index).parent == InvalidMovePathIndex
+        self.path_parent(index) == InvalidMovePathIndex
     }
 
     pub fn move_path(&mut self,
@@ -232,7 +236,7 @@ impl MoveData {
                 let parent_index = self.move_path(tcx, base);
                 let index = MovePathIndex(self.paths.len());
 
-                let next_sibling = self.path(parent_index).first_child;
+                let next_sibling = self.path_first_child(parent_index);
                 self.mut_path(parent_index).first_child = index;
 
                 self.paths.push(MovePath {
@@ -422,7 +426,7 @@ impl MoveData {
             if !f(p) {
                 return false;
             }
-            p = self.path(p).parent;
+            p = self.path_parent(p);
         }
         return true;
     }