---

yaml
---
r: 97166
b: refs/heads/dist-snap
c: ff23e12
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: d7b152701eba5f78bb9295c4fa60ad0a9ec3ff50
+refs/heads/dist-snap: ff23e1202f782adbd1b9f08dbcfbea5d257770ce
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -11,6 +11,7 @@
 
 use middle::ty;
 
+use std::cell::Cell;
 use std::vec;
 use syntax::ast;
 use syntax::codemap::Span;
@@ -49,14 +50,14 @@ impl RegionScope for ExplicitRscope {
 /// omitted regions. This occurs in function signatures.
 pub struct BindingRscope {
     binder_id: ast::NodeId,
-    anon_bindings: @mut uint
+    anon_bindings: Cell<uint>,
 }
 
 impl BindingRscope {
     pub fn new(binder_id: ast::NodeId) -> BindingRscope {
         BindingRscope {
             binder_id: binder_id,
-            anon_bindings: @mut 0
+            anon_bindings: Cell::new(0),
         }
     }
 }
@@ -66,8 +67,8 @@ impl RegionScope for BindingRscope {
                     _: Span,
                     count: uint)
                     -> Result<~[ty::Region], ()> {
-        let idx = *self.anon_bindings;
-        *self.anon_bindings += count;
+        let idx = self.anon_bindings.get();
+        self.anon_bindings.set(idx + count);
         Ok(vec::from_fn(count, |i| ty::ReLateBound(self.binder_id,
                                                    ty::BrAnon(idx + i))))
     }