diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-06-18 17:17:54 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-06-18 20:23:05 -0700 |
| commit | ddbb31eb8ea7f4fadf8728fac0ddb746951e6509 (patch) | |
| tree | 6e286a1e41b5c026bea69dc8c6b72b025814e1cd /src | |
| parent | f58de2d68759693333913733ddfb0017f4546eac (diff) | |
| download | rust-ddbb31eb8ea7f4fadf8728fac0ddb746951e6509.tar.gz rust-ddbb31eb8ea7f4fadf8728fac0ddb746951e6509.zip | |
rustc: Remove the meta keyword
Issue #487
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp/back/link.rs | 22 | ||||
| -rw-r--r-- | src/comp/front/ast.rs | 3 | ||||
| -rw-r--r-- | src/comp/front/eval.rs | 1 | ||||
| -rw-r--r-- | src/comp/front/parser.rs | 7 | ||||
| -rw-r--r-- | src/comp/middle/visit.rs | 1 | ||||
| -rw-r--r-- | src/comp/middle/walk.rs | 1 |
6 files changed, 1 insertions, 34 deletions
diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index 81857217962..15a30ea0728 100644 --- a/src/comp/back/link.rs +++ b/src/comp/back/link.rs @@ -254,30 +254,10 @@ iter crate_export_metas(&ast::crate c) -> @ast::meta_item { for (ast::attribute attr in c.node.attrs) { put @attr.node.value; } - - for (@ast::crate_directive cdir in c.node.directives) { - alt (cdir.node) { - case (ast::cdir_meta(?v, ?mis)) { - if (v == ast::export_meta) { - for (@ast::meta_item mi in mis) { put mi; } - } - } - case (_) { } - } - } } iter crate_local_metas(&ast::crate c) -> @ast::meta_item { - for (@ast::crate_directive cdir in c.node.directives) { - alt (cdir.node) { - case (ast::cdir_meta(?v, ?mis)) { - if (v == ast::local_meta) { - for (@ast::meta_item mi in mis) { put mi; } - } - } - case (_) { } - } - } + // FIXME: As above } fn get_crate_meta_export(&session::session sess, &ast::crate c, str k, diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 49710cf6656..e5638474dc4 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -80,8 +80,6 @@ type crate_ = rec(vec[@crate_directive] directives, _mod module, vec[attribute] attrs); -tag meta_visibility { export_meta; local_meta; } - tag crate_directive_ { cdir_expr(@expr); @@ -92,7 +90,6 @@ tag crate_directive_ { cdir_src_mod(ident, option::t[filename]); cdir_dir_mod(ident, option::t[filename], vec[@crate_directive]); cdir_view_item(@view_item); - cdir_meta(meta_visibility, vec[@meta_item]); cdir_syntax(path); cdir_auth(path, _auth); } diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs index 3d041124a96..33681eeed63 100644 --- a/src/comp/front/eval.rs +++ b/src/comp/front/eval.rs @@ -316,7 +316,6 @@ fn eval_crate_directive(ctx cx, env e, @ast::crate_directive cdir, str prefix, case (ast::cdir_view_item(?vi)) { vec::push[@ast::view_item](view_items, vi); } - case (ast::cdir_meta(?vi, ?mi)) { } case (ast::cdir_syntax(?pth)) { } case (ast::cdir_auth(?pth, ?eff)) { } } diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 9ab0404b9e1..ccf5f0e3003 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -2320,13 +2320,6 @@ fn parse_crate_directive(&parser p) -> ast::crate_directive { auto hi = p.get_hi_pos(); expect(p, token::SEMI); ret spanned(lo, hi, ast::cdir_auth(n, a)); - } else if (eat_word(p, "meta")) { - auto mv = ast::local_meta; - if (eat_word(p, "export")) { mv = ast::export_meta; } - auto mis = parse_meta(p); - auto hi = p.get_hi_pos(); - expect(p, token::SEMI); - ret spanned(lo, hi, ast::cdir_meta(mv, mis)); } else if (eat_word(p, "mod")) { auto id = parse_ident(p); auto file_opt = diff --git a/src/comp/middle/visit.rs b/src/comp/middle/visit.rs index 485b47ae4e4..06ca4db4554 100644 --- a/src/comp/middle/visit.rs +++ b/src/comp/middle/visit.rs @@ -73,7 +73,6 @@ fn visit_crate_directive[E](&@crate_directive cd, &E e, &vt[E] v) { } } case (cdir_view_item(?vi)) { vt(v).visit_view_item(vi, e, v); } - case (cdir_meta(_, _)) { } case (cdir_syntax(_)) { } case (cdir_auth(_, _)) { } } diff --git a/src/comp/middle/walk.rs b/src/comp/middle/walk.rs index cc17b053679..58a219127c4 100644 --- a/src/comp/middle/walk.rs +++ b/src/comp/middle/walk.rs @@ -70,7 +70,6 @@ fn walk_crate_directive(&ast_visitor v, @ast::crate_directive cd) { } } case (ast::cdir_view_item(?vi)) { walk_view_item(v, vi); } - case (ast::cdir_meta(_, _)) { } case (ast::cdir_syntax(_)) { } case (ast::cdir_auth(_, _)) { } } |
