rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #20039: barosl/if-let-friendly-error

Browse Source 
Fixes #19991.
This commit is contained in:
Alex Crichton
2014-12-21 00:04:13 -08:00
parent cfc815bef4 314ed2df09
commit eb47e1e446
10 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsyntax/parse/parser.rs
View File

@@ -41,7 +41,7 @@ use ast::{LifetimeDef, Lit, Lit_};
use ast::{LitBool, LitChar, LitByte, LitBinary};
use ast::{LitStr, LitInt, Local, LocalLet};
use ast::{MacStmtWithBraces, MacStmtWithSemicolon, MacStmtWithoutBraces};
use ast::{MutImmutable, MutMutable, Mac_, MacInvocTT, MatchNormal};
use ast::{MutImmutable, MutMutable, Mac_, MacInvocTT, MatchSource};
use ast::{Method, MutTy, BiMul, Mutability};
use ast::{MethodImplItem, NamedField, UnNeg, NoReturn, NodeId, UnNot};
use ast::{Pat, PatEnum, PatIdent, PatLit, PatRange, PatRegion, PatStruct};
@@ -3111,7 +3111,7 @@ impl<'a> Parser<'a> {
}
let hi = self.span.hi;
self.bump();
return self.mk_expr(lo, hi, ExprMatch(discriminant, arms, MatchNormal));
return self.mk_expr(lo, hi, ExprMatch(discriminant, arms, MatchSource::Normal));
}
pub fn parse_arm(&mut self) -> Arm {