Skip to content

fix(diag): Consolidate verify/run diagnostics passes #16989

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
weihanglo merged 2 commits into from
May 13, 2026
Merged

fix(diag): Consolidate verify/run diagnostics passes #16989

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab804e
fix(diag): Consolidate verify/run diagnostics passes
epage May 12, 2026
51e3c70
refactor(diag): Rename stats
epage May 12, 2026
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
84 changes: 29 additions & 55 deletions src/cargo/core/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,67 +1351,45 @@ impl<'gctx> Workspace<'gctx> {
.unwrap_or(manifest::TomlToolLints::default());

if self.gctx.cli_unstable().cargo_lints {
let mut verify_stats = DiagnosticStats::new();

missing_lints_features(
pkg.into(),
&path,
&cargo_lints,
&mut verify_stats,
self.gctx,
)?;
unknown_lints(
pkg.into(),
&path,
&cargo_lints,
&mut verify_stats,
self.gctx,
)?;

verify_stats.report_summary("parse", Some(&*pkg.name()), self.gctx)?;

let mut run_stats = DiagnosticStats::new();

check_im_a_teapot(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
implicit_minimum_version_req_pkg(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
non_kebab_case_packages(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
non_snake_case_packages(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
non_kebab_case_bins(self, pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
non_kebab_case_features(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
non_snake_case_features(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
unused_build_dependencies_no_build_rs(
pkg,
&path,
&cargo_lints,
&mut run_stats,
self.gctx,
)?;
redundant_readme(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
redundant_homepage(pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
missing_lints_inheritance(self, pkg, &path, &cargo_lints, &mut run_stats, self.gctx)?;
let mut stats = DiagnosticStats::new();

missing_lints_features(pkg.into(), &path, &cargo_lints, &mut stats, self.gctx)?;
unknown_lints(pkg.into(), &path, &cargo_lints, &mut stats, self.gctx)?;

check_im_a_teapot(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
implicit_minimum_version_req_pkg(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
non_kebab_case_packages(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
non_snake_case_packages(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
non_kebab_case_bins(self, pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
non_kebab_case_features(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
non_snake_case_features(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
unused_build_dependencies_no_build_rs(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
redundant_readme(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
redundant_homepage(pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
missing_lints_inheritance(self, pkg, &path, &cargo_lints, &mut stats, self.gctx)?;
text_direction_codepoint_in_comment(
pkg.into(),
&path,
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;
text_direction_codepoint_in_literal(
pkg.into(),
&path,
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;

run_stats.report_summary("parse", Some(&*pkg.name()), self.gctx)?;
stats.report_summary("parse", Some(&*pkg.name()), self.gctx)?;
}

Ok(())
}

pub fn emit_ws_lints(&self) -> CargoResult<()> {
let mut run_stats = DiagnosticStats::new();
let mut stats = DiagnosticStats::new();

let cargo_lints = match self.root_maybe() {
MaybePackage::Package(pkg) => {
Expand All @@ -1435,61 +1413,57 @@ impl<'gctx> Workspace<'gctx> {
.unwrap_or(manifest::TomlToolLints::default());

if self.gctx.cli_unstable().cargo_lints {
let mut verify_stats = DiagnosticStats::new();

missing_lints_features(
(self, self.root_maybe()).into(),
self.root_manifest(),
&cargo_lints,
&mut verify_stats,
&mut stats,
self.gctx,
)?;
unknown_lints(
(self, self.root_maybe()).into(),
self.root_manifest(),
&cargo_lints,
&mut verify_stats,
&mut stats,
self.gctx,
)?;

verify_stats.report_summary("parse", None, self.gctx)?;

unused_workspace_package_fields(
self,
self.root_maybe(),
self.root_manifest(),
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;
unused_workspace_dependencies(
self,
self.root_maybe(),
self.root_manifest(),
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;
implicit_minimum_version_req_ws(
self,
self.root_maybe(),
self.root_manifest(),
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;
text_direction_codepoint_in_comment(
(self, self.root_maybe()).into(),
self.root_manifest(),
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;
text_direction_codepoint_in_literal(
(self, self.root_maybe()).into(),
self.root_manifest(),
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;
}
Expand All @@ -1503,12 +1477,12 @@ impl<'gctx> Workspace<'gctx> {
self.root_maybe(),
self.root_manifest(),
&cargo_lints,
&mut run_stats,
&mut stats,
self.gctx,
)?;
}

run_stats.report_summary("parse", None, self.gctx)?;
stats.report_summary("parse", None, self.gctx)?;
Ok(())
}

Expand Down