---

yaml
---
r: 94542
b: refs/heads/try
c: 214d6bc
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: f15f9388dc62e61681e52c455adc46a48257fa6a
+refs/heads/try: 214d6bc34aa0d581a504c906b88b9bcb8583a3c0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -290,7 +290,7 @@ struct ctxt_ {
     methods: RefCell<HashMap<DefId, @Method>>,
 
     // Maps from a trait def-id to a list of the def-ids of its methods
-    trait_method_def_ids: @mut HashMap<DefId, @~[DefId]>,
+    trait_method_def_ids: RefCell<HashMap<DefId, @~[DefId]>>,
 
     // A cache for the trait_methods() routine
     trait_methods_cache: @mut HashMap<DefId, @~[@Method]>,
@@ -999,7 +999,7 @@ pub fn mk_ctxt(s: session::Session,
         ast_ty_to_ty_cache: @mut HashMap::new(),
         enum_var_cache: @mut HashMap::new(),
         methods: RefCell::new(HashMap::new()),
-        trait_method_def_ids: @mut HashMap::new(),
+        trait_method_def_ids: RefCell::new(HashMap::new()),
         trait_methods_cache: @mut HashMap::new(),
         impl_trait_cache: @mut HashMap::new(),
         ty_param_defs: @mut HashMap::new(),
@@ -3610,9 +3610,13 @@ pub fn method(cx: ctxt, id: ast::DefId) -> @Method {
 }
 
 pub fn trait_method_def_ids(cx: ctxt, id: ast::DefId) -> @~[DefId] {
-    lookup_locally_or_in_crate_store(
-        "trait_method_def_ids", id, cx.trait_method_def_ids,
-        || @csearch::get_trait_method_def_ids(cx.cstore, id))
+    let mut trait_method_def_ids = cx.trait_method_def_ids.borrow_mut();
+    lookup_locally_or_in_crate_store("trait_method_def_ids",
+                                     id,
+                                     trait_method_def_ids.get(),
+                                     || {
+        @csearch::get_trait_method_def_ids(cx.cstore, id)
+    })
 }
 
 pub fn impl_trait_ref(cx: ctxt, id: ast::DefId) -> Option<@TraitRef> {

branches/try/src/librustc/middle/typeck/collect.rs

@@ -226,7 +226,9 @@ pub fn ensure_trait_methods(ccx: &CrateCtxt,
             });
 
             let trait_def_id = local_def(trait_id);
-            tcx.trait_method_def_ids.insert(trait_def_id, method_def_ids);
+            let mut trait_method_def_ids = tcx.trait_method_def_ids
+                                              .borrow_mut();
+            trait_method_def_ids.get().insert(trait_def_id, method_def_ids);
         }
         _ => { /* Ignore things that aren't traits */ }
     }