---

yaml
---
r: 94728
b: refs/heads/try
c: 6659ae7
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: d1e23aeb0e3056a4da5c8aac86c10ae0353a8c2d
+refs/heads/try: 6659ae7d97b725e32a347a954f4e77118cc16a8a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/resolve.rs

@@ -285,15 +285,15 @@ enum DuplicateCheckingMode {
 /// One local scope.
 struct Rib {
     bindings: RefCell<HashMap<Name, DefLike>>,
-    self_binding: @mut Option<DefLike>,
+    self_binding: RefCell<Option<DefLike>>,
     kind: RibKind,
 }
 
 impl Rib {
     fn new(kind: RibKind) -> Rib {
         Rib {
             bindings: RefCell::new(HashMap::new()),
-            self_binding: @mut None,
+            self_binding: RefCell::new(None),
             kind: kind
         }
     }
@@ -3883,7 +3883,7 @@ impl Resolver {
                         _ => false
                     };
                     let def_like = DlDef(DefSelf(self_node_id, mutable));
-                    *function_value_rib.self_binding = Some(def_like);
+                    function_value_rib.self_binding.set(Some(def_like));
                 }
             }
 
@@ -4947,7 +4947,7 @@ impl Resolver {
         let mut i = self.value_ribs.len();
         while i != 0 {
             i -= 1;
-            match *self.value_ribs[i].self_binding {
+            match self.value_ribs[i].self_binding.get() {
                 Some(def_like) => {
                     match self.upvarify(self.value_ribs,
                                         i,