---

yaml
---
r: 96957
b: refs/heads/dist-snap
c: 3f444dc
h: refs/heads/master
i:
  96955: 205bfac
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: efdbd60a87d8a997df39907cf11ecfa5a8ba707e
+refs/heads/dist-snap: 3f444dca5b8d32b8fd64256ec7ffc55b480d84ea
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -297,7 +297,7 @@ struct ctxt_ {
 
     impl_trait_cache: RefCell<HashMap<ast::DefId, Option<@ty::TraitRef>>>,
 
-    trait_refs: @mut HashMap<NodeId, @TraitRef>,
+    trait_refs: RefCell<HashMap<NodeId, @TraitRef>>,
     trait_defs: @mut HashMap<DefId, @TraitDef>,
 
     /// Despite its name, `items` does not only map NodeId to an item but
@@ -986,7 +986,7 @@ pub fn mk_ctxt(s: session::Session,
         region_maps: region_maps,
         node_types: @mut HashMap::new(),
         node_type_substs: RefCell::new(HashMap::new()),
-        trait_refs: @mut HashMap::new(),
+        trait_refs: RefCell::new(HashMap::new()),
         trait_defs: @mut HashMap::new(),
         items: amap,
         intrinsic_defs: @mut HashMap::new(),
@@ -2654,7 +2654,8 @@ pub fn index_sty(sty: &sty) -> Option<mt> {
 }
 
 pub fn node_id_to_trait_ref(cx: ctxt, id: ast::NodeId) -> @ty::TraitRef {
-    match cx.trait_refs.find(&id) {
+    let trait_refs = cx.trait_refs.borrow();
+    match trait_refs.get().find(&id) {
        Some(&t) => t,
        None => cx.sess.bug(
            format!("node_id_to_trait_ref: no trait ref for node `{}`",

branches/dist-snap/src/librustc/middle/typeck/collect.rs

@@ -710,8 +710,9 @@ pub fn instantiate_trait_ref(ccx: &CrateCtxt,
             let trait_ref =
                 astconv::ast_path_to_trait_ref(
                     ccx, &rscope, trait_did, Some(self_ty), &ast_trait_ref.path);
-            ccx.tcx.trait_refs.insert(
-                ast_trait_ref.ref_id, trait_ref);
+
+            let mut trait_refs = ccx.tcx.trait_refs.borrow_mut();
+            trait_refs.get().insert(ast_trait_ref.ref_id, trait_ref);
             return trait_ref;
         }
         _ => {