mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make how lint handles unknown warn directives configurable by lint (default to warn). Closes #2480.

Browse Source
This commit is contained in:
Michael Sullivan 2012-06-01 15:58:04 -07:00
parent 9be94f6650
commit 7213274e57
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rustc/driver/driver.rs
View File

@ -406,8 +406,10 @@ fn build_session_options(match: getopts::match,
let lint_dict = lint::get_lint_dict(); let lint_dict = lint::get_lint_dict();
let lint_opts = vec::map(lint_flags) {|flag| let lint_opts = vec::map(lint_flags) {|flag|
alt lint::lookup_lint(lint_dict, flag) { alt lint::lookup_lint(lint_dict, flag) {
none { early_error(demitter, #fmt("unknown warning: %s", flag)) } (flag, none) {
some(x) { x } early_error(demitter, #fmt("unknown warning: %s", flag))
}
(_, some(x)) { x }
} }
}; };

30
src/rustc/middle/lint.rs
View File

@ -37,6 +37,7 @@ enum lint {
while_true, while_true,
path_statement, path_statement,
old_vecs, old_vecs,
unrecognized_warning,
} }
// This is pretty unfortunate. We really want some sort of "deriving Enum" // This is pretty unfortunate. We really want some sort of "deriving Enum"
@ -48,6 +49,7 @@ fn int_to_lint(i: int) -> lint {
2 { while_true } 2 { while_true }
3 { path_statement } 3 { path_statement }
4 { old_vecs } 4 { old_vecs }
5 { unrecognized_warning }
} }
} }
@ -90,7 +92,12 @@ fn get_lint_dict() -> lint_dict {
("old_vecs", ("old_vecs",
@{lint: old_vecs, @{lint: old_vecs,
desc: "old (deprecated) vectors and strings", desc: "old (deprecated) vectors and strings",
default: ignore}) default: ignore}),
("unrecognized_warning",
@{lint: unrecognized_warning,
desc: "unrecognized warning attribute",
default: warn})
]; ];
hash_from_strs(v) hash_from_strs(v)
@ -188,12 +195,13 @@ impl methods for ctxt {
alt meta.node { alt meta.node {
ast::meta_word(lintname) { ast::meta_word(lintname) {
alt lookup_lint(self.dict, lintname) { alt lookup_lint(self.dict, lintname) {
none { (name, none) {
self.tcx.sess.span_err( self.span_lint(
self.get_level(unrecognized_warning),
meta.span, meta.span,
#fmt("unknown warning: '%s'", lintname)); #fmt("unknown warning: '%s'", name));
} }
some((lint, new_level)) { (_, some((lint, new_level))) {
// we do multiple unneeded copies of the map // we do multiple unneeded copies of the map
// if many attributes are set, but this shouldn't // if many attributes are set, but this shouldn't
// actually be a problem... // actually be a problem...
@ -225,7 +233,7 @@ impl methods for ctxt {
fn lookup_lint(dict: lint_dict, s: str) fn lookup_lint(dict: lint_dict, s: str)
-> option<(lint, level)> { -> (str, option<(lint, level)>) {
let s = str::replace(s, "-", "_"); let s = str::replace(s, "-", "_");
let (name, level) = if s.starts_with("no_") { let (name, level) = if s.starts_with("no_") {
(s.substr(3u, s.len() - 3u), ignore) (s.substr(3u, s.len() - 3u), ignore)
@ -234,10 +242,11 @@ fn lookup_lint(dict: lint_dict, s: str)
} else { } else {
(s, warn) (s, warn)
}; };
alt dict.find(name) { (name,
none { none } alt dict.find(name) {
some(spec) { some((spec.lint, level)) } none { none }
} some(spec) { some((spec.lint, level)) }
})
} }
fn check_item(i: @ast::item, &&cx: ctxt, v: visit::vt<ctxt>) { fn check_item(i: @ast::item, &&cx: ctxt, v: visit::vt<ctxt>) {
@ -249,6 +258,7 @@ fn check_item(i: @ast::item, &&cx: ctxt, v: visit::vt<ctxt>) {
while_true { check_item_while_true(cx, level, i); } while_true { check_item_while_true(cx, level, i); }
path_statement { check_item_path_statement(cx, level, i); } path_statement { check_item_path_statement(cx, level, i); }
old_vecs { check_item_old_vecs(cx, level, i); } old_vecs { check_item_old_vecs(cx, level, i); }
unrecognized_warning { /* this is checked elsewhere */ }
} }
} }
if !cx.is_default { if !cx.is_default {