---

yaml
---
r: 97022
b: refs/heads/dist-snap
c: ea5368c
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: 2c3f92699e1f01301739cb78e3dd567363231d2c
+refs/heads/dist-snap: ea5368ce6e5eb1c9b28e3e072dca4f0b063f15b2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -380,15 +380,21 @@ fn parse_ty(st: &mut PState, conv: conv_did) -> ty::t {
         let key = ty::creader_cache_key {cnum: st.crate,
                                          pos: pos,
                                          len: len };
-        match st.tcx.rcache.find(&key) {
-          Some(&tt) => return tt,
+
+        let tt_opt = {
+            let rcache = st.tcx.rcache.borrow();
+            rcache.get().find_copy(&key)
+        };
+        match tt_opt {
+          Some(tt) => return tt,
           None => {
             let mut ps = PState {
                 pos: pos,
                 .. *st
             };
             let tt = parse_ty(&mut ps, |x,y| conv(x,y));
-            st.tcx.rcache.insert(key, tt);
+            let mut rcache = st.tcx.rcache.borrow_mut();
+            rcache.get().insert(key, tt);
             return tt;
           }
         }

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

@@ -174,7 +174,7 @@ pub struct creader_cache_key {
     len: uint
 }
 
-type creader_cache = @mut HashMap<creader_cache_key, t>;
+type creader_cache = RefCell<HashMap<creader_cache_key, t>>;
 
 struct intern_key {
     sty: *sty,
@@ -957,10 +957,6 @@ type type_cache = RefCell<HashMap<ast::DefId, ty_param_bounds_and_ty>>;
 
 pub type node_type_table = @mut HashMap<uint,t>;
 
-fn mk_rcache() -> creader_cache {
-    return @mut HashMap::new();
-}
-
 pub fn mk_ctxt(s: session::Session,
                dm: resolve::DefMap,
                named_region_map: @mut resolve_lifetime::NamedRegionMap,
@@ -987,7 +983,7 @@ pub fn mk_ctxt(s: session::Session,
         intrinsic_defs: RefCell::new(HashMap::new()),
         freevars: freevars,
         tcache: RefCell::new(HashMap::new()),
-        rcache: mk_rcache(),
+        rcache: RefCell::new(HashMap::new()),
         short_names_cache: RefCell::new(HashMap::new()),
         needs_unwind_cleanup_cache: RefCell::new(HashMap::new()),
         tc_cache: RefCell::new(HashMap::new()),