From e7bb33aed889aebae1b141cdcc2aeeebab1724ee Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 3 Aug 2013 23:51:29 -0400 Subject: rm obsolete `for` support from the compiler --- src/libsyntax/ast.rs | 5 ----- src/libsyntax/fold.rs | 1 - src/libsyntax/oldvisit.rs | 2 +- src/libsyntax/print/pprust.rs | 5 +---- src/libsyntax/visit.rs | 1 - 5 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 11f2c7005bc..cf7a1e51798 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -472,11 +472,6 @@ pub enum expr_ { expr_loop(Block, Option), expr_match(@expr, ~[arm]), expr_fn_block(fn_decl, Block), - // Inner expr is always an expr_fn_block. We need the wrapping node to - // easily type this (a function returning nil on the inside but bool on - // the outside). - expr_loop_body(@expr), - // Like expr_loop_body but for 'do' blocks expr_do_body(@expr), expr_block(Block), diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 000f9c73797..7ffed13940e 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -541,7 +541,6 @@ pub fn noop_fold_expr(e: &expr_, fld: @ast_fold) -> expr_ { fld.fold_expr(ohs) ) } - expr_loop_body(f) => expr_loop_body(fld.fold_expr(f)), expr_do_body(f) => expr_do_body(fld.fold_expr(f)), expr_lit(_) => (*e).clone(), expr_cast(expr, ref ty) => { diff --git a/src/libsyntax/oldvisit.rs b/src/libsyntax/oldvisit.rs index d5296e60dd3..295003c6ef5 100644 --- a/src/libsyntax/oldvisit.rs +++ b/src/libsyntax/oldvisit.rs @@ -501,7 +501,7 @@ pub fn visit_expr(ex: @expr, (e, v): (E, vt)) { (v.visit_expr)(b, (e.clone(), v)); } expr_addr_of(_, x) | expr_unary(_, _, x) | - expr_loop_body(x) | expr_do_body(x) => (v.visit_expr)(x, (e.clone(), v)), + expr_do_body(x) => (v.visit_expr)(x, (e.clone(), v)), expr_lit(_) => (), expr_cast(x, ref t) => { (v.visit_expr)(x, (e.clone(), v)); diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index c3fcacdf7b0..174b0f8e451 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1087,7 +1087,7 @@ pub fn print_call_post(s: @ps, nbsp(s); match blk.get().node { // need to handle closures specifically - ast::expr_do_body(e) | ast::expr_loop_body(e) => { + ast::expr_do_body(e) => { end(s); // we close our head box; closure // will create it's own. print_expr(s, e); @@ -1338,9 +1338,6 @@ pub fn print_expr(s: @ps, expr: &ast::expr) { // empty box to satisfy the close. ibox(s, 0); } - ast::expr_loop_body(body) => { - print_expr(s, body); - } ast::expr_do_body(body) => { print_expr(s, body); } diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 15864fab258..7aa52bc13e3 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -513,7 +513,6 @@ pub fn visit_expr(visitor: @Visitor, expression: @expr, env: E) { } expr_addr_of(_, subexpression) | expr_unary(_, _, subexpression) | - expr_loop_body(subexpression) | expr_do_body(subexpression) => { visitor.visit_expr(subexpression, env.clone()) } -- cgit 1.4.1-3-g733a5