diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index eaee67f9a6174..d75766c608ba0 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -230,15 +230,18 @@ pub fn expand_expr(e: P, fld: &mut MacroExpander) -> P { ast::ExprForLoop(pat, head, body, opt_ident) => { // to: // - // match ::std::iter::IntoIterator::into_iter() { - // mut iter => { - // [opt_ident]: loop { - // match ::std::iter::Iterator::next(&mut iter) { - // ::std::option::Option::Some() => , - // ::std::option::Option::None => break + // { + // let result = match ::std::iter::IntoIterator::into_iter() { + // mut iter => { + // [opt_ident]: loop { + // match ::std::iter::Iterator::next(&mut iter) { + // ::std::option::Option::Some() => , + // ::std::option::Option::None => break + // } // } // } - // } + // }; + // result // } // expand @@ -319,7 +322,16 @@ pub fn expand_expr(e: P, fld: &mut MacroExpander) -> P { fld.cx.expr_call(span, fld.cx.expr_path(into_iter_path), vec![head]) }; - fld.cx.expr_match(span, into_iter_expr, vec![iter_arm]) + + let match_expr = fld.cx.expr_match(span, into_iter_expr, vec![iter_arm]); + + // `{ let result = ...; result }` + let result_ident = token::gensym_ident("result"); + fld.cx.expr_block( + fld.cx.block_all( + span, + vec![fld.cx.stmt_let(span, false, result_ident, match_expr)], + Some(fld.cx.expr_ident(span, result_ident)))) } ast::ExprClosure(capture_clause, fn_decl, block) => { diff --git a/src/test/run-pass/loop-label-shadowing.rs b/src/test/run-pass/loop-label-shadowing.rs index 686a9a002cebf..d96ff869fa0ab 100644 --- a/src/test/run-pass/loop-label-shadowing.rs +++ b/src/test/run-pass/loop-label-shadowing.rs @@ -13,7 +13,7 @@ fn main() { let mut foo = Vec::new(); 'foo: for i in &[1, 2, 3] { - foo.push(i); + foo.push(*i); } }