---

yaml
---
r: 97133
b: refs/heads/dist-snap
c: 1ded423
h: refs/heads/master
i:
  97131: 6ad151f
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 12c5c198715d23f29f9f130052b15ed90d7218ba
+refs/heads/dist-snap: 1ded423505b4f36087912497b868acfccd02a7f7
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/borrowck/move_data.rs

@@ -214,9 +214,9 @@ impl MoveData {
     }
 
 
-    fn move<'a>(&'a self, index: MoveIndex) -> &'a Move {
+    fn move_next_move(&self, index: MoveIndex) -> MoveIndex {
         //! Type safe indexing operator
-        &self.moves[*index]
+        self.moves[*index].next_move
     }
 
     fn is_var_path(&self, index: MovePathIndex) -> bool {
@@ -497,7 +497,7 @@ impl MoveData {
                     ret = false;
                     break;
                 }
-                p = self.move(p).next_move;
+                p = self.move_next_move(p);
             }
             ret
         });