diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-03-08 22:36:10 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-15 22:26:36 -0700 |
| commit | a921dc487319e926467f8e6afd9900ed2f03aaa9 (patch) | |
| tree | 19f167d50b0ee94975646b205188f1a70c6fb437 /src/libsyntax | |
| parent | cc6ec8df95fbd8163b7c2c6c34469fb96b704e66 (diff) | |
| download | rust-a921dc487319e926467f8e6afd9900ed2f03aaa9.tar.gz rust-a921dc487319e926467f8e6afd9900ed2f03aaa9.zip | |
rustc: Remove compiler support for __log_level()
This commit removes all internal support for the previously used __log_level() expression. The logging subsystem was previously modified to not rely on this magical expression. This also removes the only other function to use the module_data map in trans, decl_gc_metadata. It appears that this is an ancient function from a GC only used long ago. This does not remove the crate map entirely, as libgreen still uses it to hook in to the event loop provided by libgreen.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/fold.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/visit.rs | 1 |
6 files changed, 2 insertions, 18 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 3e600249a7d..4ef46573e23 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -529,9 +529,6 @@ pub enum Expr_ { ExprAgain(Option<Ident>), ExprRet(Option<@Expr>), - /// Gets the log level for the enclosing module - ExprLogLevel, - ExprInlineAsm(InlineAsm), ExprMac(Mac), diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index b575cfaade6..997bfcc2e94 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -120,7 +120,7 @@ impl MacResult { pub fn raw_dummy_expr(sp: codemap::Span) -> @ast::Expr { @ast::Expr { id: ast::DUMMY_NODE_ID, - node: ast::ExprLogLevel, + node: ast::ExprTup(Vec::new()), span: sp } } diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 0b56cd07c88..8cc74641db8 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -816,7 +816,6 @@ pub fn noop_fold_expr<T: Folder>(e: @Expr, folder: &mut T) -> @Expr { ExprIndex(folder.fold_expr(el), folder.fold_expr(er)) } ExprPath(ref pth) => ExprPath(folder.fold_path(pth)), - ExprLogLevel => ExprLogLevel, ExprBreak(opt_ident) => ExprBreak(opt_ident.map(|x| folder.fold_ident(x))), ExprAgain(opt_ident) => ExprAgain(opt_ident.map(|x| folder.fold_ident(x))), ExprRet(ref e) => { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 040c4da6885..f52effb8c81 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -25,7 +25,7 @@ use ast::{Expr, Expr_, ExprAddrOf, ExprMatch, ExprAgain}; use ast::{ExprAssign, ExprAssignOp, ExprBinary, ExprBlock, ExprBox}; use ast::{ExprBreak, ExprCall, ExprCast}; use ast::{ExprField, ExprFnBlock, ExprIf, ExprIndex}; -use ast::{ExprLit, ExprLogLevel, ExprLoop, ExprMac}; +use ast::{ExprLit, ExprLoop, ExprMac}; use ast::{ExprMethodCall, ExprParen, ExprPath, ExprProc}; use ast::{ExprRepeat, ExprRet, ExprStruct, ExprTup, ExprUnary}; use ast::{ExprVec, ExprVstore, ExprVstoreSlice}; @@ -1886,12 +1886,6 @@ impl Parser { } } hi = self.last_span.hi; - } else if self.eat_keyword(keywords::__LogLevel) { - // LOG LEVEL expression - self.expect(&token::LPAREN); - ex = ExprLogLevel; - hi = self.span.hi; - self.expect(&token::RPAREN); } else if self.eat_keyword(keywords::Return) { // RETURN expression if can_begin_expr(&self.token) { diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 36c39220483..b1990476094 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1490,11 +1490,6 @@ pub fn print_expr(s: &mut State, expr: &ast::Expr) -> io::IoResult<()> { _ => () } } - ast::ExprLogLevel => { - try!(word(&mut s.s, "__log_level")); - try!(popen(s)); - try!(pclose(s)); - } ast::ExprInlineAsm(ref a) => { if a.volatile { try!(word(&mut s.s, "__volatile__ asm!")); diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 538528fb148..880fce58083 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -743,7 +743,6 @@ pub fn walk_expr<E: Clone, V: Visitor<E>>(visitor: &mut V, expression: &Expr, en ExprRet(optional_expression) => { walk_expr_opt(visitor, optional_expression, env.clone()) } - ExprLogLevel => {} ExprMac(ref macro) => visitor.visit_mac(macro, env.clone()), ExprParen(subexpression) => { visitor.visit_expr(subexpression, env.clone()) |
