---

yaml
---
r: 147650
b: refs/heads/try2
c: ccb18f4
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: 5c63b1febc2e618f79d07ce46c1305cfa28b6596
+refs/heads/try2: ccb18f47e25daee22f151f3d21774eec38abdbe3
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -357,7 +357,10 @@ impl<'a> CheckLoanCtxt<'a> {
                     mc::cat_local(id) |
                     mc::cat_arg(id) |
                     mc::cat_self(id) => {
-                        this.tcx().used_mut_nodes.insert(id);
+                        let mut used_mut_nodes = this.tcx()
+                                                     .used_mut_nodes
+                                                     .borrow_mut();
+                        used_mut_nodes.get().insert(id);
                         return;
                     }
 

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

@@ -607,7 +607,10 @@ impl<'a> GatherLoanCtxt<'a> {
 
         match *loan_path {
             LpVar(local_id) => {
-                self.tcx().used_mut_nodes.insert(local_id);
+                let mut used_mut_nodes = self.tcx()
+                                             .used_mut_nodes
+                                             .borrow_mut();
+                used_mut_nodes.get().insert(local_id);
             }
             LpExtend(base, mc::McInherited, _) => {
                 self.mark_loan_path_as_mutated(base);

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

@@ -1038,7 +1038,8 @@ fn check_unused_mut_pat(cx: &Context, p: &ast::Pat) {
                 }
             };
 
-            if !initial_underscore && !cx.tcx.used_mut_nodes.contains(&p.id) {
+            let used_mut_nodes = cx.tcx.used_mut_nodes.borrow();
+            if !initial_underscore && !used_mut_nodes.get().contains(&p.id) {
                 cx.span_lint(unused_mut, p.span,
                              "variable does not need to be mutable");
             }

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

@@ -353,7 +353,7 @@ struct ctxt_ {
     // Set of nodes which mark locals as mutable which end up getting used at
     // some point. Local variable definitions not in this set can be warned
     // about.
-    used_mut_nodes: @mut HashSet<ast::NodeId>,
+    used_mut_nodes: RefCell<HashSet<ast::NodeId>>,
 
     // vtable resolution information for impl declarations
     impl_vtables: typeck::impl_vtable_map,
@@ -1005,7 +1005,7 @@ pub fn mk_ctxt(s: session::Session,
         inherent_impls: RefCell::new(HashMap::new()),
         impls: RefCell::new(HashMap::new()),
         used_unsafe: RefCell::new(HashSet::new()),
-        used_mut_nodes: @mut HashSet::new(),
+        used_mut_nodes: RefCell::new(HashSet::new()),
         impl_vtables: RefCell::new(HashMap::new()),
         populated_external_types: @mut HashSet::new(),
         populated_external_traits: @mut HashSet::new(),