---

yaml
---
r: 97018
b: refs/heads/dist-snap
c: 55a7b2f
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: 42f7f7f437ad978dd95d3ec39a0f231d6cd161da
+refs/heads/dist-snap: 55a7b2feddfd54f5a4c5f4dd85d156a0da50428e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/metadata/encoder.rs

@@ -1084,7 +1084,8 @@ fn encode_info_for_item(ecx: &EncodeContext,
       item_impl(_, ref opt_trait, ty, ref ast_methods) => {
         // We need to encode information about the default methods we
         // have inherited, so we drive this based on the impl structure.
-        let imp = tcx.impls.get(&def_id);
+        let impls = tcx.impls.borrow();
+        let imp = impls.get().get(&def_id);
 
         add_to_index();
         ebml_w.start_tag(tag_items_data_item);

branches/dist-snap/src/librustc/middle/trans/meth.rs

@@ -305,7 +305,8 @@ pub fn method_with_name(ccx: &CrateContext,
         }
     }
 
-    let imp = ccx.tcx.impls.find(&impl_id)
+    let impls = ccx.tcx.impls.borrow();
+    let imp = impls.get().find(&impl_id)
         .expect("could not find impl while translating");
     let meth = imp.methods.iter().find(|m| m.ident.name == name)
         .expect("could not find method while translating");

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

@@ -344,7 +344,7 @@ struct ctxt_ {
     // Note that this contains all of the impls that we know about,
     // including ones in other crates. It's not clear that this is the best
     // way to do it.
-    impls: @mut HashMap<ast::DefId, @Impl>,
+    impls: RefCell<HashMap<ast::DefId, @Impl>>,
 
     // Set of used unsafe nodes (functions or blocks). Unsafe nodes not
     // present in this set can be warned about.
@@ -1007,7 +1007,7 @@ pub fn mk_ctxt(s: session::Session,
         destructors: RefCell::new(HashSet::new()),
         trait_impls: RefCell::new(HashMap::new()),
         inherent_impls: RefCell::new(HashMap::new()),
-        impls:  @mut HashMap::new(),
+        impls: RefCell::new(HashMap::new()),
         used_unsafe: @mut HashSet::new(),
         used_mut_nodes: @mut HashSet::new(),
         impl_vtables: @mut HashMap::new(),
@@ -4563,7 +4563,8 @@ pub fn populate_implementations_for_type_if_necessary(tcx: ctxt,
         }
 
         // Store the implementation info.
-        tcx.impls.insert(implementation_def_id, implementation);
+        let mut impls = tcx.impls.borrow_mut();
+        impls.get().insert(implementation_def_id, implementation);
     });
 
     tcx.populated_external_types.insert(type_id);
@@ -4599,7 +4600,8 @@ pub fn populate_implementations_for_trait_if_necessary(
         }
 
         // Store the implementation info.
-        tcx.impls.insert(implementation_def_id, implementation);
+        let mut impls = tcx.impls.borrow_mut();
+        impls.get().insert(implementation_def_id, implementation);
     });
 
     tcx.populated_external_traits.insert(trait_id);

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

@@ -313,7 +313,8 @@ impl CoherenceChecker {
             }
         }
 
-        tcx.impls.insert(implementation.did, implementation);
+        let mut impls = tcx.impls.borrow_mut();
+        impls.get().insert(implementation.did, implementation);
     }
 
     // Creates default method IDs and performs type substitutions for an impl
@@ -665,7 +666,8 @@ impl CoherenceChecker {
             }
         }
 
-        tcx.impls.insert(implementation.did, implementation);
+        let mut impls = tcx.impls.borrow_mut();
+        impls.get().insert(implementation.did, implementation);
     }
 
     // Adds implementations and traits from external crates to the coherence