---

yaml
---
r: 96955
b: refs/heads/dist-snap
c: 02f13ad
h: refs/heads/master
i:
  96953: ade3878
  96951: 963b8f4
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: 214d6bc34aa0d581a504c906b88b9bcb8583a3c0
+refs/heads/dist-snap: 02f13adaa34fea513ea6d3b48e8f47eff93e47a7
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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/dist-snap/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
         }
     }