From 9b69c7df194d5f9081698745ed20414d7c7c2f1c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 26 Aug 2018 19:04:44 +0300
Subject: fix curly braces parsing

---
 crates/libsyntax2/src/grammar/patterns.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'crates/libsyntax2/src')

diff --git a/crates/libsyntax2/src/grammar/patterns.rs b/crates/libsyntax2/src/grammar/patterns.rs
index 11852e0d3..114964651 100644
--- a/crates/libsyntax2/src/grammar/patterns.rs
+++ b/crates/libsyntax2/src/grammar/patterns.rs
@@ -2,7 +2,7 @@ use super::*;
 
 pub(super) const PATTERN_FIRST: TokenSet =
     token_set_union![
-        token_set![REF_KW, MUT_KW, L_PAREN, L_BRACK, AMP],
+        token_set![REF_KW, MUT_KW, L_PAREN, L_BRACK, AMP, UNDERSCORE],
         expressions::LITERAL_FIRST,
         paths::PATH_FIRST,
     ];
@@ -97,7 +97,13 @@ fn tuple_pat_fields(p: &mut Parser) {
     while !p.at(EOF) && !p.at(R_PAREN) {
         match p.current() {
             DOTDOT => p.bump(),
-            _ => pattern(p),
+            _ => {
+                if !PATTERN_FIRST.contains(p.current()) {
+                    p.error("expected a pattern");
+                    break;
+                }
+                pattern(p)
+            }
         }
         if !p.at(R_PAREN) {
             p.expect(COMMA);
@@ -125,6 +131,7 @@ fn field_pat_list(p: &mut Parser) {
                 p.bump();
                 pattern(p);
             }
+            L_CURLY => error_block(p, "expected ident"),
             _ => {
                 bind_pat(p, false);
             }
-- 
cgit v1.2.3