---

yaml
---
r: 89016
b: refs/heads/snap-stage3
c: f857398
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 473d0480954ac12bd6c73aa8dab20674ff74a21a
+refs/heads/snap-stage3: f857398bc960e683efd0923181c4a7fbd5497cf8
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/resolve.rs

@@ -4147,9 +4147,11 @@ impl Resolver {
     fn resolve_arm(&mut self, arm: &Arm) {
         self.value_ribs.push(@Rib::new(NormalRibKind));
 
-        let bindings_list = @mut HashMap::new();
+        let mut bindings_list = HashMap::new();
         for pattern in arm.pats.iter() {
-            self.resolve_pattern(*pattern, RefutableMode, Some(bindings_list));
+            self.resolve_pattern(*pattern,
+                                 RefutableMode,
+                                 Some(&mut bindings_list));
         }
 
         // This has to happen *after* we determine which
@@ -4298,7 +4300,7 @@ impl Resolver {
                        mode: PatternBindingMode,
                        // Maps idents to the node ID for the (outermost)
                        // pattern that binds them
-                       bindings_list: Option<@mut HashMap<Name,NodeId>>) {
+                       mut bindings_list: Option<&mut HashMap<Name,NodeId>>) {
         let pat_id = pattern.id;
         walk_pat(pattern, |pattern| {
             match pattern.node {
@@ -4388,7 +4390,7 @@ impl Resolver {
                             // passes make about or-patterns.)
 
                             match bindings_list {
-                                Some(bindings_list)
+                                Some(ref mut bindings_list)
                                 if !bindings_list.contains_key(&renamed) => {
                                     let this = &mut *self;
                                     let last_rib = this.value_ribs[
@@ -4401,7 +4403,7 @@ impl Resolver {
                                     }
                                     bindings_list.insert(renamed, pat_id);
                                 }
-                                Some(b) => {
+                                Some(ref mut b) => {
                                   if b.find(&renamed) == Some(&pat_id) {
                                       // Then this is a duplicate variable
                                       // in the same disjunct, which is an