---

yaml
---
r: 96951
b: refs/heads/dist-snap
c: fffbe7a
h: refs/heads/master
i:
  96949: 0971985
  96947: 7baabae
  96943: be4ffb2
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: 09589aae4f36aeb1bb028e0f3e4f2bbc697412b2
+refs/heads/dist-snap: fffbe7a8cdf2378a3c5617d1600cf2d31b7a357f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -30,6 +30,7 @@ use util::ppaux::{Repr, UserString};
 use util::common::{indenter};
 
 use std::cast;
+use std::cell::RefCell;
 use std::cmp;
 use std::hashmap::{HashMap, HashSet};
 use std::ops;
@@ -264,7 +265,7 @@ pub type ctxt = @ctxt_;
 /// later on.
 struct ctxt_ {
     diag: @mut syntax::diagnostic::span_handler,
-    interner: @mut HashMap<intern_key, ~t_box_>,
+    interner: RefCell<HashMap<intern_key, ~t_box_>>,
     next_id: @mut uint,
     cstore: @mut metadata::cstore::CStore,
     sess: session::Session,
@@ -977,7 +978,7 @@ pub fn mk_ctxt(s: session::Session,
         named_region_map: named_region_map,
         item_variance_map: @mut HashMap::new(),
         diag: s.diagnostic(),
-        interner: @mut HashMap::new(),
+        interner: RefCell::new(HashMap::new()),
         next_id: @mut primitives::LAST_PRIMITIVE_ID,
         cstore: s.cstore,
         sess: s,
@@ -1042,9 +1043,13 @@ pub fn mk_t(cx: ctxt, st: sty) -> t {
     };
 
     let key = intern_key { sty: to_unsafe_ptr(&st) };
-    match cx.interner.find(&key) {
-      Some(t) => unsafe { return cast::transmute(&t.sty); },
-      _ => ()
+
+    {
+        let mut interner = cx.interner.borrow_mut();
+        match interner.get().find(&key) {
+          Some(t) => unsafe { return cast::transmute(&t.sty); },
+          _ => ()
+        }
     }
 
     let mut flags = 0u;
@@ -1138,7 +1143,8 @@ pub fn mk_t(cx: ctxt, st: sty) -> t {
         sty: sty_ptr,
     };
 
-    cx.interner.insert(key, t);
+    let mut interner = cx.interner.borrow_mut();
+    interner.get().insert(key, t);
 
     *cx.next_id += 1;