From 9f460e7af88ca6efc1a58ebe781b47447acdb21b Mon Sep 17 00:00:00 2001
From: Jakub Wieczorek <jakub@jakub.cc>
Date: Sun, 6 Jul 2014 23:54:40 +0200
Subject: [PATCH] Properly bind nested pattern bindings when there's more than
 one

Fixes #15488.
---
 src/librustc/middle/check_match.rs          |  9 +----
 src/librustc/middle/trans/_match.rs         | 35 +++++++++----------
 src/test/run-pass/match-pattern-bindings.rs | 38 +++++++++++++++++++++
 3 files changed, 56 insertions(+), 26 deletions(-)
 create mode 100644 src/test/run-pass/match-pattern-bindings.rs

diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs
index abc4212dbb24..db5268220fa9 100644
--- a/src/librustc/middle/check_match.rs
+++ b/src/librustc/middle/check_match.rs
@@ -411,14 +411,7 @@ fn is_useful(cx: &MatchCheckCtxt, matrix @ &Matrix(ref rows): &Matrix,
         return NotUseful;
     }
     let real_pat = match rows.iter().find(|r| r.get(0).id != 0) {
-        Some(r) => {
-            match r.get(0).node {
-                // An arm of the form `ref x @ sub_pat` has type
-                // `sub_pat`, not `&sub_pat` as `x` itself does.
-                PatIdent(BindByRef(_), _, Some(sub)) => sub,
-                _ => *r.get(0)
-            }
-        }
+        Some(r) => raw_pat(*r.get(0)),
         None if v.len() == 0 => return NotUseful,
         None => v[0]
     };
diff --git a/src/librustc/middle/trans/_match.rs b/src/librustc/middle/trans/_match.rs
index e0be1d89a94d..0809079347b1 100644
--- a/src/librustc/middle/trans/_match.rs
+++ b/src/librustc/middle/trans/_match.rs
@@ -413,25 +413,24 @@ fn expand_nested_bindings<'a, 'b>(
     let _indenter = indenter();
 
     m.iter().map(|br| {
-        match br.pats.get(col).node {
-            ast::PatIdent(_, ref path1, Some(inner)) => {
-                let pats = Vec::from_slice(br.pats.slice(0u, col))
-                           .append((vec!(inner))
-                                   .append(br.pats.slice(col + 1u, br.pats.len())).as_slice());
+        let mut bound_ptrs = br.bound_ptrs.clone();
+        let mut pat = *br.pats.get(col);
+        loop {
+            pat = match pat.node {
+                ast::PatIdent(_, ref path, Some(inner)) => {
+                    bound_ptrs.push((path.node, val));
+                    inner.clone()
+                },
+                _ => break
+            }
+        }
 
-                let mut bound_ptrs = br.bound_ptrs.clone();
-                bound_ptrs.push((path1.node, val));
-                Match {
-                    pats: pats,
-                    data: &*br.data,
-                    bound_ptrs: bound_ptrs
-                }
-            }
-            _ => Match {
-                pats: br.pats.clone(),
-                data: &*br.data,
-                bound_ptrs: br.bound_ptrs.clone()
-            }
+        let mut pats = br.pats.clone();
+        *pats.get_mut(col) = pat;
+        Match {
+            pats: pats,
+            data: &*br.data,
+            bound_ptrs: bound_ptrs
         }
     }).collect()
 }
diff --git a/src/test/run-pass/match-pattern-bindings.rs b/src/test/run-pass/match-pattern-bindings.rs
new file mode 100644
index 000000000000..61e905e5b17b
--- /dev/null
+++ b/src/test/run-pass/match-pattern-bindings.rs
@@ -0,0 +1,38 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    let value = Some(1i);
+    assert_eq!(match value {
+        ref a @ Some(_) => a,
+        ref b @ None => b
+    }, &Some(1i));
+    assert_eq!(match value {
+        ref a @ ref _c @ Some(_) => a,
+        ref b @ None => b
+    }, &Some(1i));
+    assert_eq!(match value {
+        _a @ ref c @ Some(_) => c,
+        ref b @ None => b
+    }, &Some(1i));
+    assert_eq!(match "foobarbaz" {
+        _a @ b @ _ => b
+    }, "foobarbaz");
+
+    let a @ b @ c = "foobarbaz";
+    assert_eq!(a, "foobarbaz");
+    assert_eq!(b, "foobarbaz");
+    assert_eq!(c, "foobarbaz");
+    let value = Some(true);
+    let ref a @ b @ ref c = value;
+    assert_eq!(a, &Some(true));
+    assert_eq!(b, Some(true));
+    assert_eq!(c, &Some(true));
+}