diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index a92234ba129..5b5f4690e9d 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -1335,7 +1335,7 @@ fn propagate_through_expr(&self, expr: @expr, succ: LiveNode) self.propagate_through_expr(l, ln) } - expr_log(_, l, r) | + expr_log(l, r) | expr_index(l, r) | expr_binary(_, l, r) => { self.propagate_through_exprs(~[l, r], succ) diff --git a/src/librustc/middle/moves.rs b/src/librustc/middle/moves.rs index 16f133b8794..9d0a2c338fc 100644 --- a/src/librustc/middle/moves.rs +++ b/src/librustc/middle/moves.rs @@ -567,7 +567,7 @@ fn use_expr(&self, self.consume_block(blk, visitor); } - expr_log(_, a_expr, b_expr) => { + expr_log(a_expr, b_expr) => { self.consume_expr(a_expr, visitor); self.use_expr(b_expr, Read, visitor); } diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 33576a682a7..6fa2b273746 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -507,7 +507,7 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block { ast::expr_ret(ex) => { return controlflow::trans_ret(bcx, ex); } - ast::expr_log(_, lvl, a) => { + ast::expr_log(lvl, a) => { return controlflow::trans_log(expr, lvl, bcx, a); } ast::expr_while(cond, ref body) => { diff --git a/src/librustc/middle/trans/type_use.rs b/src/librustc/middle/trans/type_use.rs index cad2a03f7a1..1d9e57ce8ce 100644 --- a/src/librustc/middle/trans/type_use.rs +++ b/src/librustc/middle/trans/type_use.rs @@ -329,7 +329,7 @@ pub fn mark_for_expr(cx: Context, e: @expr) { type_needs(cx, use_repr, ty::type_autoderef(cx.ccx.tcx, base_ty)); mark_for_method_call(cx, e.id, e.callee_id); } - expr_log(_, _, val) => { + expr_log(_, val) => { node_type_needs(cx, use_tydesc, val.id); } expr_call(f, _, _) => { diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index 75c6bfd5d64..adb8fd82883 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -2402,7 +2402,7 @@ fn check_loop_body(fcx: @mut FnCtxt, } fcx.write_bot(id); } - ast::expr_log(_, lv, e) => { + ast::expr_log(lv, e) => { check_expr_has_type(fcx, lv, ty::mk_mach_uint(tcx, ast::ty_u32)); diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 6071cc643a3..f873d6b6bb4 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -543,12 +543,6 @@ pub struct expr { span: span, } -#[auto_encode] -#[auto_decode] -#[deriving(Eq)] -pub enum log_level { error, debug, log_other } -// 0 = error, 1 = debug, 2 = log_other - #[auto_encode] #[auto_decode] #[deriving(Eq)] @@ -598,7 +592,7 @@ pub enum expr_ { expr_break(Option), expr_again(Option), expr_ret(Option<@expr>), - expr_log(log_level, @expr, @expr), + expr_log(@expr, @expr), expr_inline_asm(@~str, // asm ~[(@~str, @expr)], // inputs diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 017e95ab4c1..5e56bf18fa8 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -552,9 +552,8 @@ fn fold_field_(field: field, fld: @ast_fold) -> field { expr_ret(ref e) => { expr_ret(e.map(|x| fld.fold_expr(*x))) } - expr_log(i, lv, e) => { + expr_log(lv, e) => { expr_log( - i, fld.fold_expr(lv), fld.fold_expr(e) ) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 9cd53e72aa3..d7af59910b4 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1230,7 +1230,7 @@ fn parse_bottom_expr(&self) -> @expr { let lvl = self.parse_expr(); self.expect(&token::COMMA); let e = self.parse_expr(); - ex = expr_log(ast::log_other, lvl, e); + ex = expr_log(lvl, e); hi = self.span.hi; self.expect(&token::RPAREN); } else if self.eat_keyword(&~"return") { diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 28b6d132842..bda5b3671a9 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1386,20 +1386,14 @@ fn print_field(s: @ps, field: ast::field) { _ => () } } - ast::expr_log(lvl, lexp, expr) => { - match lvl { - ast::debug => { word_nbsp(s, ~"log"); print_expr(s, expr); } - ast::error => { word_nbsp(s, ~"log_err"); print_expr(s, expr); } - ast::log_other => { - word_nbsp(s, ~"log"); - popen(s); - print_expr(s, lexp); - word(s.s, ~","); - space_if_not_bol(s); - print_expr(s, expr); - pclose(s); - } - } + ast::expr_log(lexp, expr) => { + word(s.s, ~"__log"); + popen(s); + print_expr(s, lexp); + word(s.s, ~","); + space_if_not_bol(s); + print_expr(s, expr); + pclose(s); } ast::expr_inline_asm(a, in, out, c, v, _) => { if v { diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index a159c98d21b..2bdf26fba58 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -559,7 +559,7 @@ pub fn visit_expr(ex: @expr, e: E, v: vt) { expr_break(_) => (), expr_again(_) => (), expr_ret(eo) => visit_expr_opt(eo, e, v), - expr_log(_, lv, x) => { + expr_log(lv, x) => { (v.visit_expr)(lv, e, v); (v.visit_expr)(x, e, v); }