bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #28973 - nrc:match-source, r=Manishearth

Browse source 
r? @Manishearth
This commit is contained in:
bors 2015-10-11 21:35:48 +00:00
commit c413bb4fff
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustc_front/lowering.rs
View file

@ -1422,7 +1422,11 @@ pub fn lower_expr(lctx: &LoweringContext, e: &Expr) -> P<hir::Expr> {
vec![head]) vec![head])
}; };
let match_expr = expr_match(lctx, e.span, into_iter_expr, vec![iter_arm]); let match_expr = expr_match(lctx,
e.span,
into_iter_expr,
vec![iter_arm],
hir::MatchSource::ForLoopDesugar);
// `{ let result = ...; result }` // `{ let result = ...; result }`
let result_ident = lctx.str_to_ident("result"); let result_ident = lctx.str_to_ident("result");
@ -1574,11 +1578,12 @@ fn expr_path(lctx: &LoweringContext, path: hir::Path) -> P<hir::Expr> {
fn expr_match(lctx: &LoweringContext, fn expr_match(lctx: &LoweringContext,
span: Span, span: Span,
arg: P<hir::Expr>, arg: P<hir::Expr>,
arms: Vec<hir::Arm>) arms: Vec<hir::Arm>,
source: hir::MatchSource)
-> P<hir::Expr> { -> P<hir::Expr> {
expr(lctx, expr(lctx,
span, span,
hir::ExprMatch(arg, arms, hir::MatchSource::Normal)) hir::ExprMatch(arg, arms, source))
} }
fn expr_block(lctx: &LoweringContext, b: P<hir::Block>) -> P<hir::Expr> { fn expr_block(lctx: &LoweringContext, b: P<hir::Block>) -> P<hir::Expr> {