---

yaml
---
r: 97155
b: refs/heads/dist-snap
c: 89dfd00
h: refs/heads/master
i:
  97153: f46c3a8
  97151: 8577238
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: a483ee8e33c74ffe2b06e62b934c91ec0aa762ba
+refs/heads/dist-snap: 89dfd00dcf8016447143e985dbbd812dba4c1b3a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -29,7 +29,7 @@ use util::ppaux::{Repr, UserString};
 use util::common::{indenter};
 
 use std::cast;
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::cmp;
 use std::hashmap::{HashMap, HashSet};
 use std::ops;
@@ -265,7 +265,7 @@ pub type ctxt = @ctxt_;
 struct ctxt_ {
     diag: @mut syntax::diagnostic::span_handler,
     interner: RefCell<HashMap<intern_key, ~t_box_>>,
-    next_id: @mut uint,
+    next_id: Cell<uint>,
     cstore: @metadata::cstore::CStore,
     sess: session::Session,
     def_map: resolve::DefMap,
@@ -970,7 +970,7 @@ pub fn mk_ctxt(s: session::Session,
         item_variance_map: RefCell::new(HashMap::new()),
         diag: s.diagnostic(),
         interner: RefCell::new(HashMap::new()),
-        next_id: @mut primitives::LAST_PRIMITIVE_ID,
+        next_id: Cell::new(primitives::LAST_PRIMITIVE_ID),
         cstore: s.cstore,
         sess: s,
         def_map: dm,
@@ -1124,7 +1124,7 @@ pub fn mk_t(cx: ctxt, st: sty) -> t {
 
     let t = ~t_box_ {
         sty: st,
-        id: *cx.next_id,
+        id: cx.next_id.get(),
         flags: flags,
     };
 
@@ -1137,7 +1137,7 @@ pub fn mk_t(cx: ctxt, st: sty) -> t {
     let mut interner = cx.interner.borrow_mut();
     interner.get().insert(key, t);
 
-    *cx.next_id += 1;
+    cx.next_id.set(cx.next_id.get() + 1);
 
     unsafe {
         cast::transmute::<*sty, t>(sty_ptr)