Skip to content

fix(lints): handle lints separately at ws pkg level #16367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epage merged 6 commits into from
Dec 9, 2025
Merged

fix(lints): handle lints separately at ws pkg level #16367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b17b782
test(lint): bad lint but not inheriting
weihanglo Dec 9, 2025
d49dca3
refactor(lint): make arg name consistent
weihanglo Dec 9, 2025
e739958
refactor(lint): bail outside lint logic
weihanglo Dec 9, 2025
148dd33
fix(lint): dont talk about ws inheritance when linting packages
weihanglo Dec 9, 2025
614b619
refactor(lint): check feature enablement one level up
weihanglo Dec 9, 2025
e5db075
fix(lints): handle lints separately at ws pkg level
weihanglo Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 41 additions & 24 deletions src/cargo/core/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,6 @@ impl<'gctx> Workspace<'gctx> {
}

pub fn emit_pkg_lints(&self, pkg: &Package, path: &Path) -> CargoResult<()> {
let mut error_count = 0;
let toml_lints = pkg
.manifest()
.normalized_toml()
Expand All @@ -1282,40 +1281,44 @@ impl<'gctx> Workspace<'gctx> {
.cloned()
.unwrap_or(manifest::TomlToolLints::default());

let ws_contents = self.root_maybe().contents();

let ws_document = self.root_maybe().document();

if self.gctx.cli_unstable().cargo_lints {
let mut verify_error_count = 0;

analyze_cargo_lints_table(
pkg,
pkg.into(),
&path,
&cargo_lints,
ws_contents,
ws_document,
self.root_manifest(),
&mut verify_error_count,
self.gctx,
)?;
check_im_a_teapot(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;

if verify_error_count > 0 {
let plural = if verify_error_count == 1 { "" } else { "s" };
bail!("encountered {verify_error_count} error{plural} while verifying lints")
}

let mut run_error_count = 0;

check_im_a_teapot(pkg, &path, &cargo_lints, &mut run_error_count, self.gctx)?;
implicit_minimum_version_req(
pkg.into(),
&path,
&cargo_lints,
&mut error_count,
&mut run_error_count,
self.gctx,
)?;
}

if error_count > 0 {
let plural = if error_count == 1 { "" } else { "s" };
bail!("encountered {error_count} error{plural} while running lints")
} else {
Ok(())
if run_error_count > 0 {
let plural = if run_error_count == 1 { "" } else { "s" };
bail!("encountered {run_error_count} error{plural} while running lints")
}
}

Ok(())
}

pub fn emit_ws_lints(&self) -> CargoResult<()> {
let mut error_count = 0;
let mut run_error_count = 0;

let cargo_lints = match self.root_maybe() {
MaybePackage::Package(pkg) => {
Expand All @@ -1339,12 +1342,26 @@ impl<'gctx> Workspace<'gctx> {
.unwrap_or(manifest::TomlToolLints::default());

if self.gctx.cli_unstable().cargo_lints {
// Calls to lint functions go in here
let mut verify_error_count = 0;

analyze_cargo_lints_table(
self.root_maybe().into(),
self.root_manifest(),
&cargo_lints,
&mut verify_error_count,
self.gctx,
)?;

if verify_error_count > 0 {
let plural = if verify_error_count == 1 { "" } else { "s" };
bail!("encountered {verify_error_count} error{plural} while verifying lints")
}

implicit_minimum_version_req(
self.root_maybe().into(),
self.root_manifest(),
&cargo_lints,
&mut error_count,
&mut run_error_count,
self.gctx,
)?;
}
Expand All @@ -1357,14 +1374,14 @@ impl<'gctx> Workspace<'gctx> {
self.root_maybe(),
self.root_manifest(),
&cargo_lints,
&mut error_count,
&mut run_error_count,
self.gctx,
)?;
}

if error_count > 0 {
let plural = if error_count == 1 { "" } else { "s" };
bail!("encountered {error_count} error{plural} while running lints")
if run_error_count > 0 {
let plural = if run_error_count == 1 { "" } else { "s" };
bail!("encountered {run_error_count} error{plural} while running lints")
} else {
Ok(())
}
Expand Down
Loading