syntax: fix pretty printing __log stmts

diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs
index a92234ba1298e4a63611d9f03ce77818450378c0..5b5f4690e9d812500621ab17b212065f7f8aa3d0 100644 (file)
--- 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 16f133b8794d8c0bd045b902b03dd5c1444b0e79..9d0a2c338fca1a1fc690d9ae555a8554215d8a92 100644 (file)
--- 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 33576a682a7f1c5e7bbd1b33178313fd35b5048f..6fa2b273746a9dc79bbaee0ee0bf7d0cc94e5052 100644 (file)
--- 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 cad2a03f7a1ef8143c74c0329ce83013dac396a2..1d9e57ce8ce1537e78358cb7097725faf901bc1b 100644 (file)
--- 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 75c6bfd5d6405ff7e9d89e85245bad7be9b04e5c..adb8fd82883c04f68430db0996c7cc8da0525029 100644 (file)
--- 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 6071cc643a36770867f0c96cb609bbe15afd841a..f873d6b6bb43ebb3e88cc01ced4779476eb23e97 100644 (file)
--- 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<ident>),
     expr_again(Option<ident>),
     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 017e95ab4c11cf4ace2fb66671f0b4583d108eb7..5e56bf18fa8c7899b18b8a13003f851e57b99028 100644 (file)
--- 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 9cd53e72aa355dd6c10e3abb6eaf56a59fad7fea..d7af59910b4cca03d58a09d0389357ba92f27188 100644 (file)
--- 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 28b6d1328420e66e5f600fdd3c0913e99fb69b8f..bda5b3671a9c3be9212730a4d9047593cd432b26 100644 (file)
--- 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 a159c98d21b27537f4bc7b6fb22889222b8942fa..2bdf26fba586270bf2032bba8430b75d4cb40e74 100644 (file)
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -559,7 +559,7 @@ pub fn visit_expr<E>(ex: @expr, e: E, v: vt<E>) {
         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);
         }