---

yaml
---
r: 94726
b: refs/heads/try
c: 1b06a95
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: 111e167f48bd2e850e33828f2cb8837ce0da44a7
+refs/heads/try: 1b06a9593fe1d1ec8d1f54efcdc57689907df942
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -49,7 +49,7 @@ pub struct MoveData {
     /// assigned dataflow bits, but we track them because they still
     /// kill move bits.
     path_assignments: RefCell<~[Assignment]>,
-    assignee_ids: HashSet<ast::NodeId>,
+    assignee_ids: RefCell<HashSet<ast::NodeId>>,
 }
 
 pub struct FlowedMoveData {
@@ -170,7 +170,7 @@ impl MoveData {
             moves: RefCell::new(~[]),
             path_assignments: RefCell::new(~[]),
             var_assignments: RefCell::new(~[]),
-            assignee_ids: HashSet::new(),
+            assignee_ids: RefCell::new(HashSet::new()),
         }
     }
 
@@ -395,7 +395,10 @@ impl MoveData {
 
         let path_index = self.move_path(tcx, lp);
 
-        self.assignee_ids.insert(assignee_id);
+        {
+            let mut assignee_ids = self.assignee_ids.borrow_mut();
+            assignee_ids.get().insert(assignee_id);
+        }
 
         let assignment = Assignment {
             path: path_index,
@@ -666,7 +669,8 @@ impl FlowedMoveData {
                        -> bool {
         //! True if `id` is the id of the LHS of an assignment
 
-        self.move_data.assignee_ids.iter().any(|x| x == &id)
+        let assignee_ids = self.move_data.assignee_ids.borrow();
+        assignee_ids.get().iter().any(|x| x == &id)
     }
 
     pub fn each_assignment_of(&self,