From 73a8513b88f28344c37d3b3296f93cbc8f30cefa Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Mon, 15 Feb 2016 13:14:31 +1300
Subject: Rebasing

---
 src/libsyntax/parse/parser.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libsyntax/parse/parser.rs')

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 572c51cc2f4..59e79200568 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3254,7 +3254,7 @@ impl<'a> Parser<'a> {
                     if self.token == token::CloseDelim(token::Brace) {
                         self.bump();
                     }
-                    return Ok(self.mk_expr(lo, hi, ExprMatch(discriminant, arms), attrs));
+                    return Ok(self.mk_expr(lo, hi, ExprKind::Match(discriminant, arms), attrs));
                 }
             }
         }
@@ -3772,7 +3772,7 @@ impl<'a> Parser<'a> {
 
     /// Parse a statement. may include decl.
     pub fn parse_stmt(&mut self) -> PResult<'a, Option<Stmt>> {
-        Ok(self.parse_stmt_().map(P))
+        Ok(self.parse_stmt_())
     }
 
     // Eat tokens until we can be relatively sure we reached the end of the
-- 
cgit 1.4.1-3-g733a5