diff options
| -rw-r--r-- | clippy_dev/src/main.rs | 1 | ||||
| -rw-r--r-- | src/driver.rs | 37 | ||||
| -rw-r--r-- | src/lintlist/lint.rs | 30 | ||||
| -rw-r--r-- | src/lintlist/mod.rs | 1 |
4 files changed, 44 insertions, 25 deletions
diff --git a/clippy_dev/src/main.rs b/clippy_dev/src/main.rs index e3a4378d524..d4f798a3cae 100644 --- a/clippy_dev/src/main.rs +++ b/clippy_dev/src/main.rs @@ -102,6 +102,7 @@ fn update_lints(update_mode: &UpdateMode) { pub mod lint; pub use lint::Lint; +pub use lint::LINT_LEVELS; pub const ALL_LINTS: [Lint; {}] = {:#?};\n", sorted_usable_lints.len(), diff --git a/src/driver.rs b/src/driver.rs index 94c89d82c8f..9f9aba2c060 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -125,9 +125,17 @@ Available lint options: " ); + let lint_level = |lint: &Lint| { + LINT_LEVELS + .iter() + .find(|level_mapping| level_mapping.0 == lint.group) + .map(|(_, level)| level) + .unwrap() + }; + let mut lints: Vec<_> = ALL_LINTS.iter().collect(); // The sort doesn't case-fold but it's doubtful we care. - lints.sort_by_cached_key(|x: &&Lint| ("unknown", x.name)); + lints.sort_by_cached_key(|x: &&Lint| (lint_level(x), x.name)); let max_name_len = lints .iter() @@ -153,7 +161,7 @@ Available lint options: let print_lints = |lints: &[&Lint]| { for lint in lints { let name = lint.name.replace("_", "-"); - println!(" {} {:7.7} {}", padded(&scoped(&name)), "unknown", lint.desc); + println!(" {} {:7.7} {}", padded(&scoped(&name)), lint_level(lint), lint.desc); } println!("\n"); }; @@ -179,12 +187,12 @@ Available lint options: println!("Lint groups provided by rustc:\n"); println!(" {} sub-lints", padded("name")); println!(" {} ---------", padded("----")); - // println!(" {} all lints that are set to issue warnings", padded("warnings")); let print_lint_groups = || { for group in lint_groups { let name = group.to_lowercase().replace("_", "-"); - let desc = lints.iter() + let desc = lints + .iter() .filter(|&lint| lint.group == group) .map(|lint| lint.name) .map(|name| name.replace("_", "-")) @@ -196,27 +204,6 @@ Available lint options: }; print_lint_groups(); - - // print_lint_groups(builtin_groups); - - // match (loaded_plugins, plugin.len(), plugin_groups.len()) { - // (false, 0, _) | (false, _, 0) => { - // println!("Compiler plugins can provide additional lints and lint groups. To see a \ - // listing of these, re-run `rustc -W help` with a crate filename."); - // } - // (false, ..) => panic!("didn't load lint plugins but got them anyway!"), - // (true, 0, 0) => println!("This crate does not load any lint plugins or lint groups."), - // (true, l, g) => { - // if l > 0 { - // println!("Lint checks provided by plugins loaded by this crate:\n"); - // print_lints(plugin); - // } - // if g > 0 { - // println!("Lint groups provided by plugins loaded by this crate:\n"); - // print_lint_groups(plugin_groups); - // } - // } - // } } fn display_help() { diff --git a/src/lintlist/lint.rs b/src/lintlist/lint.rs index a4dd0747059..44c4a528907 100644 --- a/src/lintlist/lint.rs +++ b/src/lintlist/lint.rs @@ -7,3 +7,33 @@ pub struct Lint { pub deprecation: Option<&'static str>, pub module: &'static str, } + +#[derive(PartialOrd, PartialEq, Ord, Eq)] +pub enum LintLevel { + Allow, + Warn, + Deny, +} + +impl std::fmt::Display for LintLevel { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + let s = match self { + LintLevel::Allow => "allow", + LintLevel::Warn => "warn", + LintLevel::Deny => "deny", + }; + + write!(f, "{}", s) + } +} + +pub const LINT_LEVELS: [(&str, LintLevel); 8] = [ + ("correctness", LintLevel::Deny), + ("style", LintLevel::Warn), + ("complexity", LintLevel::Warn), + ("perf", LintLevel::Warn), + ("restriction", LintLevel::Allow), + ("pedantic", LintLevel::Allow), + ("nursery", LintLevel::Allow), + ("cargo", LintLevel::Allow), +]; diff --git a/src/lintlist/mod.rs b/src/lintlist/mod.rs index ea26224b3e4..3c93c41b4dc 100644 --- a/src/lintlist/mod.rs +++ b/src/lintlist/mod.rs @@ -2,6 +2,7 @@ pub mod lint; pub use lint::Lint; +pub use lint::LINT_LEVELS; pub const ALL_LINTS: [Lint; 304] = [ Lint { |