---

yaml
---
r: 97108
b: refs/heads/dist-snap
c: 522743c
h: refs/heads/master
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: 7cb234bee9dcb411031d4a0b960b2096258aa6ad
+refs/heads/dist-snap: 522743c9dbf561ed026e917d9911d94fad5d19a5
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/borrowck/gather_loans/lifetime.rs

@@ -305,7 +305,10 @@ impl<'a> GuaranteeLifetimeContext<'a> {
             mc::cat_local(id) |
             mc::cat_self(id) |
             mc::cat_arg(id) => {
-                self.bccx.moved_variables_set.contains(&id)
+                let moved_variables_set = self.bccx
+                                              .moved_variables_set
+                                              .borrow();
+                moved_variables_set.get().contains(&id)
             }
             mc::cat_rvalue(..) |
             mc::cat_static_item |

branches/dist-snap/src/librustc/middle/moves.rs

@@ -169,7 +169,7 @@ pub type MovesMap = @RefCell<HashSet<NodeId>>;
  * Note: The `VariableMovesMap` stores expression ids that
  * are moves, whereas this set stores the ids of the variables
  * that are moved at some point */
-pub type MovedVariablesSet = @mut HashSet<NodeId>;
+pub type MovedVariablesSet = @RefCell<HashSet<NodeId>>;
 
 /** See the section Output on the module comment for explanation. */
 #[deriving(Clone)]
@@ -217,7 +217,7 @@ pub fn compute_moves(tcx: ty::ctxt,
         move_maps: MoveMaps {
             moves_map: @RefCell::new(HashSet::new()),
             capture_map: @RefCell::new(HashMap::new()),
-            moved_variables_set: @mut HashSet::new()
+            moved_variables_set: @RefCell::new(HashSet::new())
         }
     };
     let visit_cx = &mut visit_cx;
@@ -344,7 +344,11 @@ impl VisitContext {
                         let def = self.tcx.def_map.get_copy(&expr.id);
                         let r = moved_variable_node_id_from_def(def);
                         for &id in r.iter() {
-                            self.move_maps.moved_variables_set.insert(id);
+                            let mut moved_variables_set =
+                                self.move_maps
+                                    .moved_variables_set
+                                    .borrow_mut();
+                            moved_variables_set.get().insert(id);
                         }
                     }
                     Read => {}