syntax: Make match arm parsing more restrictive again

Require comma separators for all expression types except the plain block

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 5b889b4ad96..c675af6803c 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -963,7 +963,7 @@ class parser {
                 hi = self.span.hi;
                 ex = expr_vstore(self.mk_expr(lo, hi, ex), vstore_fixed(v));
             }
-          }
+          },
           _ => ()
         }
 
@@ -1579,7 +1579,7 @@ class parser {
             let expr = self.parse_expr_res(RESTRICT_STMT_EXPR);
 
             let require_comma =
-                classify::expr_requires_semi_to_be_stmt(expr)
+                !classify::expr_is_simple_block(expr)
                 && self.token != token::RBRACE;
 
             if require_comma {
@@ -1839,7 +1839,7 @@ class parser {
                                             (token::COMMA),
                                         |p| p.parse_pat(refutable));
                                   }
-                              }
+                              },
                               _ => ()
                             }
                             // at this point, we're not sure whether it's a