---

yaml
---
r: 147709
b: refs/heads/try2
c: 1f76a9b
h: refs/heads/master
i:
  147707: 48905a2
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: f62faa89edb16a340a0be471037301ebf1457919
+refs/heads/try2: 1f76a9ba5ef3b9b1f903ef3fd0f932972566720c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -364,7 +364,7 @@ struct ctxt_ {
 
     // The set of external traits whose implementations have been read. This
     // is used for lazy resolution of traits.
-    populated_external_traits: @mut HashSet<ast::DefId>,
+    populated_external_traits: RefCell<HashSet<ast::DefId>>,
 
     // These two caches are used by const_eval when decoding external statics
     // and variants that are found.
@@ -1008,7 +1008,7 @@ pub fn mk_ctxt(s: session::Session,
         used_mut_nodes: RefCell::new(HashSet::new()),
         impl_vtables: RefCell::new(HashMap::new()),
         populated_external_types: RefCell::new(HashSet::new()),
-        populated_external_traits: @mut HashSet::new(),
+        populated_external_traits: RefCell::new(HashSet::new()),
 
         extern_const_statics: RefCell::new(HashMap::new()),
         extern_const_variants: RefCell::new(HashMap::new()),
@@ -4589,8 +4589,12 @@ pub fn populate_implementations_for_trait_if_necessary(
     if trait_id.crate == LOCAL_CRATE {
         return
     }
-    if tcx.populated_external_traits.contains(&trait_id) {
-        return
+    {
+        let populated_external_traits = tcx.populated_external_traits
+                                           .borrow();
+        if populated_external_traits.get().contains(&trait_id) {
+            return
+        }
     }
 
     csearch::each_implementation_for_trait(tcx.sess.cstore, trait_id,
@@ -4615,7 +4619,9 @@ pub fn populate_implementations_for_trait_if_necessary(
         impls.get().insert(implementation_def_id, implementation);
     });
 
-    tcx.populated_external_traits.insert(trait_id);
+    let mut populated_external_traits = tcx.populated_external_traits
+                                           .borrow_mut();
+    populated_external_traits.get().insert(trait_id);
 }
 
 /// Given the def_id of an impl, return the def_id of the trait it implements.