---

yaml
---
r: 94717
b: refs/heads/try
c: f700cf3
h: refs/heads/master
i:
  94715: 5249456
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: f19a9b96004d04ae885de30cbc4f88e214a87fb8
+refs/heads/try: f700cf38724a4a9ab31850cf6a5b11c6dbe0524f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -181,6 +181,10 @@ impl MoveData {
         self.paths[*index].parent
     }
 
+    fn path_first_move(&self, index: MovePathIndex) -> MoveIndex {
+        self.paths[*index].first_move
+    }
+
     fn path<'a>(&'a self, index: MovePathIndex) -> &'a MovePath {
         //! Type safe indexing operator
         &self.paths[*index]
@@ -319,7 +323,7 @@ impl MoveData {
         let path_index = self.move_path(tcx, lp);
         let move_index = MoveIndex(self.moves.len());
 
-        let next_move = self.path(path_index).first_move;
+        let next_move = self.path_first_move(path_index);
         self.mut_path(path_index).first_move = move_index;
 
         self.moves.push(Move {
@@ -456,7 +460,7 @@ impl MoveData {
                             -> bool {
         let mut ret = true;
         self.each_extending_path(index0, |index| {
-            let mut p = self.path(index).first_move;
+            let mut p = self.path_first_move(index);
             while p != InvalidMoveIndex {
                 if !f(p) {
                     ret = false;