---

yaml
---
r: 147670
b: refs/heads/try2
c: fcb4781
h: refs/heads/master
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: f700cf38724a4a9ab31850cf6a5b11c6dbe0524f
+refs/heads/try2: fcb47813a4db607ae35e24e8e549d6f849723b5a
 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

@@ -185,9 +185,12 @@ impl MoveData {
         self.paths[*index].first_move
     }
 
-    fn path<'a>(&'a self, index: MovePathIndex) -> &'a MovePath {
-        //! Type safe indexing operator
-        &self.paths[*index]
+    fn path_first_child(&self, index: MovePathIndex) -> MovePathIndex {
+        self.paths[*index].first_child
+    }
+
+    fn path_next_sibling(&self, index: MovePathIndex) -> MovePathIndex {
+        self.paths[*index].next_sibling
     }
 
     fn mut_path<'a>(&'a mut self, index: MovePathIndex) -> &'a mut MovePath {
@@ -443,12 +446,12 @@ impl MoveData {
             return false;
         }
 
-        let mut p = self.path(index).first_child;
+        let mut p = self.path_first_child(index);
         while p != InvalidMovePathIndex {
             if !self.each_extending_path(p, |x| f(x)) {
                 return false;
             }
-            p = self.path(p).next_sibling;
+            p = self.path_next_sibling(p);
         }
 
         return true;