---

yaml
---
r: 96959
b: refs/heads/dist-snap
c: 2612d76
h: refs/heads/master
i:
  96957: fe6c471
  96955: 205bfac
  96951: 963b8f4
  96943: be4ffb2
  96927: 324d241
  96895: b1ab6ad
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: 2ead970b215e2db865b00d48024c81d0052547eb
+refs/heads/dist-snap: 2612d76d2276d15e30c022426d2ae5222a080b83
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -303,7 +303,7 @@ struct ctxt_ {
     /// Despite its name, `items` does not only map NodeId to an item but
     /// also to expr/stmt/local/arg/etc
     items: ast_map::map,
-    intrinsic_defs: @mut HashMap<ast::DefId, t>,
+    intrinsic_defs: RefCell<HashMap<ast::DefId, t>>,
     freevars: freevars::freevar_map,
     tcache: type_cache,
     rcache: creader_cache,
@@ -989,7 +989,7 @@ pub fn mk_ctxt(s: session::Session,
         trait_refs: RefCell::new(HashMap::new()),
         trait_defs: RefCell::new(HashMap::new()),
         items: amap,
-        intrinsic_defs: @mut HashMap::new(),
+        intrinsic_defs: RefCell::new(HashMap::new()),
         freevars: freevars,
         tcache: @mut HashMap::new(),
         rcache: mk_rcache(),
@@ -4417,14 +4417,16 @@ pub fn count_traits_and_supertraits(tcx: ctxt,
 
 pub fn get_tydesc_ty(tcx: ctxt) -> Result<t, ~str> {
     tcx.lang_items.require(TyDescStructLangItem).map(|tydesc_lang_item| {
-        tcx.intrinsic_defs.find_copy(&tydesc_lang_item)
+        let intrinsic_defs = tcx.intrinsic_defs.borrow();
+        intrinsic_defs.get().find_copy(&tydesc_lang_item)
             .expect("Failed to resolve TyDesc")
     })
 }
 
 pub fn get_opaque_ty(tcx: ctxt) -> Result<t, ~str> {
     tcx.lang_items.require(OpaqueStructLangItem).map(|opaque_lang_item| {
-        tcx.intrinsic_defs.find_copy(&opaque_lang_item)
+        let intrinsic_defs = tcx.intrinsic_defs.borrow();
+        intrinsic_defs.get().find_copy(&opaque_lang_item)
             .expect("Failed to resolve Opaque")
     })
 }

branches/dist-snap/src/librustc/middle/typeck/collect.rs

@@ -76,7 +76,8 @@ pub fn collect_item_types(ccx: @mut CrateCtxt, crate: &ast::Crate) {
                               lang_item: ast::DefId) {
         let ty::ty_param_bounds_and_ty { ty: ty, .. } =
             ccx.get_item_ty(lang_item);
-        ccx.tcx.intrinsic_defs.insert(lang_item, ty);
+        let mut intrinsic_defs = ccx.tcx.intrinsic_defs.borrow_mut();
+        intrinsic_defs.get().insert(lang_item, ty);
     }
 
     match ccx.tcx.lang_items.ty_desc() {