itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cargo-lints): Cleanup getting the level for a lint

Browse Source
This commit is contained in:
Scott Schafer 2024-04-24 13:42:34 -06:00
parent 52dae0c1f6
commit b83c0a4939
No known key found for this signature in database
1 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/cargo/util/lints.rs
View File

@ -86,39 +86,27 @@ pub struct Lint {
impl Lint { impl Lint {
pub fn level(&self, lints: &TomlToolLints, edition: Edition) -> LintLevel { pub fn level(&self, lints: &TomlToolLints, edition: Edition) -> LintLevel {
let edition_level = self self.groups
.edition_lint_opts
.filter(|(e, _)| edition >= *e)
.map(|(_, l)| l);
if self.default_level == LintLevel::Forbid || edition_level == Some(LintLevel::Forbid) {
return LintLevel::Forbid;
}
let level = self
.groups
.iter() .iter()
.map(|g| g.name) .map(|g| {
.chain(std::iter::once(self.name))
.filter_map(|n| lints.get(n).map(|l| (n, l)))
.max_by_key(|(n, l)| {
( (
l.level() == TomlLintLevel::Forbid, g.name,
l.priority(), level_priority(g.name, g.default_level, g.edition_lint_opts, lints, edition),
std::cmp::Reverse(*n),
) )
}); })
.chain(std::iter::once((
match level { self.name,
Some((_, toml_lint)) => toml_lint.level().into(), level_priority(
None => { self.name,
if let Some(level) = edition_level { self.default_level,
level self.edition_lint_opts,
} else { lints,
self.default_level edition,
} ),
} )))
} .max_by_key(|(n, (l, p))| (l == &LintLevel::Forbid, *p, std::cmp::Reverse(*n)))
.map(|(_, (l, _))| l)
.unwrap()
} }
} }
@ -163,6 +151,34 @@ impl From<TomlLintLevel> for LintLevel {
} }
} }
fn level_priority(
name: &str,
default_level: LintLevel,
edition_lint_opts: Option<(Edition, LintLevel)>,
lints: &TomlToolLints,
edition: Edition,
) -> (LintLevel, i8) {
let unspecified_level = if let Some(level) = edition_lint_opts
.filter(|(e, _)| edition >= *e)
.map(|(_, l)| l)
{
level
} else {
default_level
};
// Don't allow the group to be overridden if the level is `Forbid`
if unspecified_level == LintLevel::Forbid {
return (unspecified_level, 0);
}
if let Some(defined_level) = lints.get(name) {
(defined_level.level().into(), defined_level.priority())
} else {
(unspecified_level, 0)
}
}
const IM_A_TEAPOT: Lint = Lint { const IM_A_TEAPOT: Lint = Lint {
name: "im_a_teapot", name: "im_a_teapot",
desc: "`im_a_teapot` is specified", desc: "`im_a_teapot` is specified",