---

yaml
---
r: 147566
b: refs/heads/try2
c: dd745b3
h: refs/heads/master
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: 72f9cbe8ac36196bfb55b78e35fd92a0749d4740
+refs/heads/try2: dd745b388dad16973baf798a86b7141f96b76af4
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/astencode.rs

@@ -1017,7 +1017,8 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
     }
 
     {
-        let r = maps.capture_map.find(&id);
+        let capture_map = maps.capture_map.borrow();
+        let r = capture_map.get().find(&id);
         for &cap_vars in r.iter() {
             ebml_w.tag(c::tag_table_capture_map, |ebml_w| {
                 ebml_w.id(id);
@@ -1283,7 +1284,10 @@ fn decode_side_tables(xcx: @ExtendedDecodeContext,
                             at_vec::to_managed_move(
                                 val_dsr.read_to_vec(
                                     |val_dsr| val_dsr.read_capture_var(xcx)));
-                        dcx.maps.capture_map.insert(id, cvars);
+                        let mut capture_map = dcx.maps
+                                                 .capture_map
+                                                 .borrow_mut();
+                        capture_map.get().insert(id, cvars);
                     }
                     _ => {
                         xcx.dcx.tcx.sess.bug(

branches/try2/src/librustc/middle/borrowck/check_loans.rs

@@ -713,7 +713,8 @@ fn check_loans_in_fn<'a>(this: &mut CheckLoanCtxt<'a>,
     fn check_captured_variables(this: &CheckLoanCtxt,
                                 closure_id: ast::NodeId,
                                 span: Span) {
-        let cap_vars = this.bccx.capture_map.get(&closure_id);
+        let capture_map = this.bccx.capture_map.borrow();
+        let cap_vars = capture_map.get().get(&closure_id);
         for cap_var in cap_vars.iter() {
             let var_id = ast_util::def_id_of_def(cap_var.def).node;
             let var_path = @LpVar(var_id);

branches/try2/src/librustc/middle/borrowck/gather_loans/gather_moves.rs

@@ -69,7 +69,8 @@ fn gather_move_from_expr_or_pat(bccx: &BorrowckCtxt,
 pub fn gather_captures(bccx: &BorrowckCtxt,
                        move_data: &mut MoveData,
                        closure_expr: @ast::Expr) {
-    let captured_vars = bccx.capture_map.get(&closure_expr.id);
+    let capture_map = bccx.capture_map.borrow();
+    let captured_vars = capture_map.get().get(&closure_expr.id);
     for captured_var in captured_vars.iter() {
         match captured_var.mode {
             moves::CapMove => {

branches/try2/src/librustc/middle/const_eval.rs

@@ -124,7 +124,7 @@ pub fn lookup_variant_by_id(tcx: ty::ctxt,
             method_map: @mut HashMap::new(),
             vtable_map: @mut HashMap::new(),
             write_guard_map: @mut HashSet::new(),
-            capture_map: @mut HashMap::new()
+            capture_map: @RefCell::new(HashMap::new())
         };
         let e = match csearch::maybe_get_item_ast(tcx, enum_def,
             |a, b, c, d| astencode::decode_inlined_item(a,
@@ -174,7 +174,7 @@ pub fn lookup_const_by_id(tcx: ty::ctxt,
             method_map: @mut HashMap::new(),
             vtable_map: @mut HashMap::new(),
             write_guard_map: @mut HashSet::new(),
-            capture_map: @mut HashMap::new()
+            capture_map: @RefCell::new(HashMap::new())
         };
         let e = match csearch::maybe_get_item_ast(tcx, def_id,
             |a, b, c, d| astencode::decode_inlined_item(a, b, maps, c, d)) {

branches/try2/src/librustc/middle/liveness.rs

@@ -495,7 +495,8 @@ fn visit_expr(v: &mut LivenessVisitor, expr: @Expr, this: @mut IrMaps) {
         // being the location that the variable is used.  This results
         // in better error messages than just pointing at the closure
         // construction site.
-        let cvs = this.capture_map.get(&expr.id);
+        let capture_map = this.capture_map.borrow();
+        let cvs = capture_map.get().get(&expr.id);
         let mut call_caps = ~[];
         for cv in cvs.iter() {
             match moves::moved_variable_node_id_from_def(cv.def) {

branches/try2/src/librustc/middle/moves.rs

@@ -137,6 +137,7 @@ use util::common::indenter;
 use util::ppaux::UserString;
 
 use std::at_vec;
+use std::cell::RefCell;
 use std::hashmap::{HashSet, HashMap};
 use syntax::ast::*;
 use syntax::ast_util;
@@ -158,7 +159,7 @@ pub struct CaptureVar {
     mode: CaptureMode // How variable is being accessed
 }
 
-pub type CaptureMap = @mut HashMap<NodeId, @[CaptureVar]>;
+pub type CaptureMap = @RefCell<HashMap<NodeId, @[CaptureVar]>>;
 
 pub type MovesMap = @mut HashSet<NodeId>;
 
@@ -215,7 +216,7 @@ pub fn compute_moves(tcx: ty::ctxt,
         method_map: method_map,
         move_maps: MoveMaps {
             moves_map: @mut HashSet::new(),
-            capture_map: @mut HashMap::new(),
+            capture_map: @RefCell::new(HashMap::new()),
             moved_variables_set: @mut HashSet::new()
         }
     };
@@ -564,7 +565,12 @@ impl VisitContext {
                     self.use_pat(a.pat);
                 }
                 let cap_vars = self.compute_captures(expr.id);
-                self.move_maps.capture_map.insert(expr.id, cap_vars);
+                {
+                    let mut capture_map = self.move_maps
+                                              .capture_map
+                                              .borrow_mut();
+                    capture_map.get().insert(expr.id, cap_vars);
+                }
                 self.consume_block(body);
             }
 

branches/try2/src/librustc/middle/trans/closure.rs

@@ -400,7 +400,10 @@ pub fn trans_expr_fn(bcx: @Block,
 
     let Result {bcx: bcx, val: closure} = match sigil {
         ast::BorrowedSigil | ast::ManagedSigil | ast::OwnedSigil => {
-            let cap_vars = ccx.maps.capture_map.get_copy(&user_id);
+            let cap_vars = {
+                let capture_map = ccx.maps.capture_map.borrow();
+                capture_map.get().get_copy(&user_id)
+            };
             let ClosureResult {llbox, cdata_ty, bcx}
                 = build_closure(bcx, cap_vars, sigil);
             trans_closure(ccx,