about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-11 21:35:48 +0000
committerbors <bors@rust-lang.org>2015-10-11 21:35:48 +0000
commitc413bb4fff6f0ff718f2b8aaa6c871d00b86e77b (patch)
tree67e020706eeb405a811f6b983a968a2717e71d06
parent8fbb35b8357d8cb4a105b56eb6af401c4d6802c9 (diff)
parent254a10b318b69cc1e564168b66511658261e76a6 (diff)
downloadrust-c413bb4fff6f0ff718f2b8aaa6c871d00b86e77b.tar.gz
rust-c413bb4fff6f0ff718f2b8aaa6c871d00b86e77b.zip
Auto merge of #28973 - nrc:match-source, r=Manishearth
r? @Manishearth 
-rw-r--r--src/librustc_front/lowering.rs11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/librustc_front/lowering.rs b/src/librustc_front/lowering.rs
index 4ee5fa2c1e9..5bd188020a3 100644
--- a/src/librustc_front/lowering.rs
+++ b/src/librustc_front/lowering.rs
@@ -1422,7 +1422,11 @@ pub fn lower_expr(lctx: &LoweringContext, e: &Expr) -> P<hir::Expr> {
                               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_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,
               span: Span,
               arg: P<hir::Expr>,
-              arms: Vec<hir::Arm>)
+              arms: Vec<hir::Arm>,
+              source: hir::MatchSource)
               -> P<hir::Expr> {
     expr(lctx,
          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> {