---

yaml
---
r: 34009
b: refs/heads/snap-stage3
c: 184f510
h: refs/heads/master
i:
  34007: 7a32c8f
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: cb7996a565b4cc37601c5248aa889fb108023f9a
+refs/heads/snap-stage3: 184f5102b37c9a52342382fe9e88144a62cd9782
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/parse/parser.rs

@@ -2046,8 +2046,6 @@ impl Parser {
                 pat = self.parse_pat_ident(refutable, bind_by_value);
             } else if self.eat_keyword(~"move") {
                 pat = self.parse_pat_ident(refutable, bind_by_move);
-            } else if !is_plain_ident(self.token) {
-                pat = self.parse_enum_variant(refutable);
             } else {
                 let binding_mode;
                 // XXX: Aren't these two cases deadcode? -- bblum
@@ -2066,7 +2064,7 @@ impl Parser {
                 let cannot_be_enum_or_struct;
                 match self.look_ahead(1) {
                     token::LPAREN | token::LBRACKET | token::LT |
-                    token::LBRACE =>
+                    token::LBRACE | token::MOD_SEP =>
                         cannot_be_enum_or_struct = false,
                     _ =>
                         cannot_be_enum_or_struct = true
@@ -2163,32 +2161,6 @@ impl Parser {
         pat_ident(binding_mode, name, sub)
     }
 
-    fn parse_enum_variant(refutable: bool) -> ast::pat_ {
-        let enum_path = self.parse_path_with_tps(true);
-        match self.token {
-          token::LPAREN => {
-            match self.look_ahead(1u) {
-              token::BINOP(token::STAR) => { // foo(*)
-                self.expect(token::LPAREN);
-                self.expect(token::BINOP(token::STAR));
-                self.expect(token::RPAREN);
-                pat_enum(enum_path, None)
-              }
-              _ => { // foo(a, ..., z)
-                let args = self.parse_unspanned_seq(
-                    token::LPAREN, token::RPAREN,
-                    seq_sep_trailing_disallowed(token::COMMA),
-                    |p| p.parse_pat(refutable));
-                pat_enum(enum_path, Some(args))
-              }
-            }
-          }
-          _ => { // option::None
-            pat_enum(enum_path, Some(~[]))
-          }
-        }
-    }
-
     fn parse_local(is_mutbl: bool,
                    allow_init: bool) -> @local {
         let lo = self.span.lo;

branches/snap-stage3/src/test/run-pass/module-qualified-struct-destructure.rs

@@ -0,0 +1,12 @@
+mod m {
+    pub struct S {
+        x: int,
+        y: int
+    }
+}
+
+fn main() {
+    let x = m::S { x: 1, y: 2 };
+    let m::S { x: a, y: b } = x;
+}
+