---

yaml
---
r: 147671
b: refs/heads/try2
c: 026364c
h: refs/heads/master
i:
  147669: b168e55
  147667: 0b2e9e5
  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: fcb47813a4db607ae35e24e8e549d6f849723b5a
+refs/heads/try2: 026364ca26a35f0d710d9b7d6501d267f8f82684
 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

@@ -193,10 +193,18 @@ impl MoveData {
         self.paths[*index].next_sibling
     }
 
-    fn mut_path<'a>(&'a mut self, index: MovePathIndex) -> &'a mut MovePath {
-        //! Type safe indexing operator
-        &mut self.paths[*index]
+    fn set_path_first_move(&mut self,
+                           index: MovePathIndex,
+                           first_move: MoveIndex) {
+        self.paths[*index].first_move = first_move
+    }
+
+    fn set_path_first_child(&mut self,
+                            index: MovePathIndex,
+                            first_child: MovePathIndex) {
+        self.paths[*index].first_child = first_child
     }
+                            
 
     fn move<'a>(&'a self, index: MoveIndex) -> &'a Move {
         //! Type safe indexing operator
@@ -244,7 +252,7 @@ impl MoveData {
                 let index = MovePathIndex(self.paths.len());
 
                 let next_sibling = self.path_first_child(parent_index);
-                self.mut_path(parent_index).first_child = index;
+                self.set_path_first_child(parent_index, index);
 
                 self.paths.push(MovePath {
                     loan_path: lp,
@@ -327,7 +335,7 @@ impl MoveData {
         let move_index = MoveIndex(self.moves.len());
 
         let next_move = self.path_first_move(path_index);
-        self.mut_path(path_index).first_move = move_index;
+        self.set_path_first_move(path_index, move_index);
 
         self.moves.push(Move {
             path: path_index,