---

yaml
---
r: 94543
b: refs/heads/try
c: 02f13ad
h: refs/heads/master
i:
  94541: ae42598
  94539: 1d01124
  94535: 73b2825
  94527: 359573f
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: 214d6bc34aa0d581a504c906b88b9bcb8583a3c0
+refs/heads/try: 02f13adaa34fea513ea6d3b48e8f47eff93e47a7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/metadata/encoder.rs

@@ -463,7 +463,8 @@ fn encode_reexported_static_trait_methods(ecx: &EncodeContext,
                                           ebml_w: &mut writer::Encoder,
                                           exp: &middle::resolve::Export2)
                                           -> bool {
-    match ecx.tcx.trait_methods_cache.find(&exp.def_id) {
+    let trait_methods_cache = ecx.tcx.trait_methods_cache.borrow();
+    match trait_methods_cache.get().find(&exp.def_id) {
         Some(methods) => {
             for &m in methods.iter() {
                 if m.explicit_self == ast::sty_static {

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

@@ -293,7 +293,7 @@ struct ctxt_ {
     trait_method_def_ids: RefCell<HashMap<DefId, @~[DefId]>>,
 
     // A cache for the trait_methods() routine
-    trait_methods_cache: @mut HashMap<DefId, @~[@Method]>,
+    trait_methods_cache: RefCell<HashMap<DefId, @~[@Method]>>,
 
     impl_trait_cache: @mut HashMap<ast::DefId, Option<@ty::TraitRef>>,
 
@@ -1000,7 +1000,7 @@ pub fn mk_ctxt(s: session::Session,
         enum_var_cache: @mut HashMap::new(),
         methods: RefCell::new(HashMap::new()),
         trait_method_def_ids: RefCell::new(HashMap::new()),
-        trait_methods_cache: @mut HashMap::new(),
+        trait_methods_cache: RefCell::new(HashMap::new()),
         impl_trait_cache: @mut HashMap::new(),
         ty_param_defs: @mut HashMap::new(),
         adjustments: @mut HashMap::new(),
@@ -3591,12 +3591,13 @@ pub fn trait_method(cx: ctxt, trait_did: ast::DefId, idx: uint) -> @Method {
 
 
 pub fn trait_methods(cx: ctxt, trait_did: ast::DefId) -> @~[@Method] {
-    match cx.trait_methods_cache.find(&trait_did) {
+    let mut trait_methods_cache = cx.trait_methods_cache.borrow_mut();
+    match trait_methods_cache.get().find(&trait_did) {
         Some(&methods) => methods,
         None => {
             let def_ids = ty::trait_method_def_ids(cx, trait_did);
             let methods = @def_ids.map(|d| ty::method(cx, *d));
-            cx.trait_methods_cache.insert(trait_did, methods);
+            trait_methods_cache.get().insert(trait_did, methods);
             methods
         }
     }