Skip to content

refactor(diag): Move lints to diagnostics #16978

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
Muscraft merged 1 commit into from
May 8, 2026
Merged

refactor(diag): Move lints to diagnostics #16978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions crates/xtask-lint-docs/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::fmt::Write;
use std::path::PathBuf;

use cargo::lints::Lint;
use cargo::lints::LintLevel;
use cargo::diagnostics::Lint;
use cargo::diagnostics::LintLevel;
use cargo::util::command_prelude::{ArgMatchesExt, flag};
use itertools::Itertools;

Expand All @@ -20,7 +20,10 @@ fn main() -> anyhow::Result<()> {
let mut forbid = Vec::new();

let mut lint_docs = String::new();
for lint in cargo::lints::LINTS.iter().sorted_by_key(|lint| lint.name) {
for lint in cargo::diagnostics::LINTS
.iter()
.sorted_by_key(|lint| lint.name)
{
if lint.docs.is_some() {
let sectipn = match lint.primary_group.default_level {
LintLevel::Allow => &mut allow,
Expand Down Expand Up @@ -72,15 +75,15 @@ fn main() -> anyhow::Result<()> {
}

fn lint_groups(buf: &mut String) -> anyhow::Result<()> {
let (max_name_len, max_desc_len) = cargo::lints::LINT_GROUPS.iter().filter(|g| !g.hidden).fold(
(0, 0),
|(max_name_len, max_desc_len), group| {
let (max_name_len, max_desc_len) = cargo::diagnostics::LINT_GROUPS
.iter()
.filter(|g| !g.hidden)
.fold((0, 0), |(max_name_len, max_desc_len), group| {
// We add 9 to account for the "cargo::" prefix and backticks
let name_len = group.name.chars().count() + 9;
let desc_len = group.desc.chars().count();
(max_name_len.max(name_len), max_desc_len.max(desc_len))
},
);
});
let default_level_len = "Default level".chars().count();
writeln!(buf, "\n")?;
writeln!(
Expand All @@ -95,7 +98,7 @@ fn lint_groups(buf: &mut String) -> anyhow::Result<()> {
"-".repeat(max_desc_len),
"-".repeat(default_level_len)
)?;
for group in cargo::lints::LINT_GROUPS.iter() {
for group in cargo::diagnostics::LINT_GROUPS.iter() {
if group.hidden {
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pub use crate::core::compiler::unit::UnitInterner;
use crate::core::manifest::TargetSourcePath;
use crate::core::profiles::{FramePointers, PanicStrategy, Profile, StripInner};
use crate::core::{Feature, PackageId, Target};
use crate::lints::get_key_value;
use crate::diagnostics::get_key_value;
use crate::util::OnceExt;
use crate::util::errors::{CargoResult, VerboseError};
use crate::util::interning::InternedString;
Expand Down
8 changes: 4 additions & 4 deletions src/cargo/core/compiler/unused_deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ use crate::core::PackageId;
use crate::core::compiler::build_config::CompileMode;
use crate::core::dependency::DepKind;
use crate::core::manifest::TargetKind;
use crate::lints::LintLevel;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::lints::rules::unused_dependencies::LINT;
use crate::diagnostics::LintLevel;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;
use crate::diagnostics::rules::unused_dependencies::LINT;
use crate::util::errors::CargoResult;
use crate::util::interning::InternedString;

Expand Down
38 changes: 19 additions & 19 deletions src/cargo/core/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ use crate::core::{
PatchLocation,
};
use crate::core::{EitherManifest, Package, SourceId, VirtualManifest};
use crate::lints::rules::blanket_hint_mostly_unused;
use crate::lints::rules::check_im_a_teapot;
use crate::lints::rules::implicit_minimum_version_req_pkg;
use crate::lints::rules::implicit_minimum_version_req_ws;
use crate::lints::rules::missing_lints_features;
use crate::lints::rules::missing_lints_inheritance;
use crate::lints::rules::non_kebab_case_bins;
use crate::lints::rules::non_kebab_case_features;
use crate::lints::rules::non_kebab_case_packages;
use crate::lints::rules::non_snake_case_features;
use crate::lints::rules::non_snake_case_packages;
use crate::lints::rules::redundant_homepage;
use crate::lints::rules::redundant_readme;
use crate::lints::rules::text_direction_codepoint_in_comment;
use crate::lints::rules::text_direction_codepoint_in_literal;
use crate::lints::rules::unknown_lints;
use crate::lints::rules::unused_build_dependencies_no_build_rs;
use crate::lints::rules::unused_workspace_dependencies;
use crate::lints::rules::unused_workspace_package_fields;
use crate::diagnostics::rules::blanket_hint_mostly_unused;
use crate::diagnostics::rules::check_im_a_teapot;
use crate::diagnostics::rules::implicit_minimum_version_req_pkg;
use crate::diagnostics::rules::implicit_minimum_version_req_ws;
use crate::diagnostics::rules::missing_lints_features;
use crate::diagnostics::rules::missing_lints_inheritance;
use crate::diagnostics::rules::non_kebab_case_bins;
use crate::diagnostics::rules::non_kebab_case_features;
use crate::diagnostics::rules::non_kebab_case_packages;
use crate::diagnostics::rules::non_snake_case_features;
use crate::diagnostics::rules::non_snake_case_packages;
use crate::diagnostics::rules::redundant_homepage;
use crate::diagnostics::rules::redundant_readme;
use crate::diagnostics::rules::text_direction_codepoint_in_comment;
use crate::diagnostics::rules::text_direction_codepoint_in_literal;
use crate::diagnostics::rules::unknown_lints;
use crate::diagnostics::rules::unused_build_dependencies_no_build_rs;
use crate::diagnostics::rules::unused_workspace_dependencies;
use crate::diagnostics::rules::unused_workspace_package_fields;
use crate::ops;
use crate::ops::lockfile::LOCKFILE_NAME;
use crate::sources::{CRATES_IO_INDEX, CRATES_IO_REGISTRY, PathSource, SourceConfigMap};
Expand Down
0 src/cargo/lints/lint.rs → src/cargo/diagnostics/lint.rs
View file
Open in desktop
File renamed without changes.
0 src/cargo/lints/mod.rs → src/cargo/diagnostics/mod.rs
View file
Open in desktop
File renamed without changes.
0 src/cargo/lints/report.rs → src/cargo/diagnostics/report.rs
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...lints/rules/blanket_hint_mostly_unused.rs → ...stics/rules/blanket_hint_mostly_unused.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ use crate::CargoResult;
use crate::GlobalContext;
use crate::core::MaybePackage;
use crate::core::Workspace;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "blanket_hint_mostly_unused",
Expand Down
8 changes: 4 additions & 4 deletions src/cargo/lints/rules/im_a_teapot.rs → src/cargo/diagnostics/rules/im_a_teapot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Feature;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

/// This lint is only to be used for testing purposes
pub static LINT: &Lint = &Lint {
Expand Down
10 changes: 5 additions & 5 deletions ...nts/rules/implicit_minimum_version_req.rs → ...ics/rules/implicit_minimum_version_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ use crate::core::Manifest;
use crate::core::MaybePackage;
use crate::core::Package;
use crate::core::Workspace;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value;
use crate::diagnostics::rel_cwd_manifest_path;
use crate::util::OptVersionReq;

pub static LINT: &Lint = &Lint {
Expand Down
9 changes: 5 additions & 4 deletions ...rgo/lints/rules/missing_lints_features.rs → ...agnostics/rules/missing_lints_features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ use super::find_lint_or_group;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Feature;
use crate::lints::ManifestFor;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::ManifestFor;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

#[instrument(skip_all)]
pub fn missing_lints_features(
Expand All @@ -29,7 +29,8 @@ pub fn missing_lints_features(
continue;
};

let (_, source, _) = crate::lints::lint::level_priority(name, *default_level, cargo_lints);
let (_, source, _) =
crate::diagnostics::lint::level_priority(name, *default_level, cargo_lints);

// Only run analysis on user-specified lints
if !source.is_user_specified() {
Expand Down
6 changes: 3 additions & 3 deletions .../lints/rules/missing_lints_inheritance.rs → ...ostics/rules/missing_lints_inheritance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::core::Workspace;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "missing_lints_inheritance",
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/lints/rules/mod.rs → src/cargo/diagnostics/rules/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use super::LintGroup;
use super::LintLevel;
use crate::core::Feature;

pub static LINTS: &[&crate::lints::Lint] = &[
pub static LINTS: &[&crate::diagnostics::Lint] = &[
blanket_hint_mostly_unused::LINT,
implicit_minimum_version_req::LINT,
im_a_teapot::LINT,
Expand Down
12 changes: 6 additions & 6 deletions src/cargo/lints/rules/non_kebab_case_bins.rs → .../diagnostics/rules/non_kebab_case_bins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::core::Workspace;
use crate::lints::AsIndex;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::AsIndex;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "non_kebab_case_bins",
Expand Down
10 changes: 5 additions & 5 deletions ...go/lints/rules/non_kebab_case_features.rs → ...gnostics/rules/non_kebab_case_features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ use super::RESTRICTION;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "non_kebab_case_features",
Expand Down
10 changes: 5 additions & 5 deletions ...go/lints/rules/non_kebab_case_packages.rs → ...gnostics/rules/non_kebab_case_packages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ use super::RESTRICTION;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "non_kebab_case_packages",
Expand Down
10 changes: 5 additions & 5 deletions ...go/lints/rules/non_snake_case_features.rs → ...gnostics/rules/non_snake_case_features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ use super::RESTRICTION;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "non_snake_case_features",
Expand Down
10 changes: 5 additions & 5 deletions ...go/lints/rules/non_snake_case_packages.rs → ...gnostics/rules/non_snake_case_packages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ use super::RESTRICTION;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "non_snake_case_packages",
Expand Down
10 changes: 5 additions & 5 deletions src/cargo/lints/rules/redundant_homepage.rs → ...o/diagnostics/rules/redundant_homepage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ use super::STYLE;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "redundant_homepage",
Expand Down
10 changes: 5 additions & 5 deletions src/cargo/lints/rules/redundant_readme.rs → ...rgo/diagnostics/rules/redundant_readme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ use super::STYLE;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::LintLevelSource;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::LintLevelSource;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;
use crate::util::toml::DEFAULT_README_FILES;

pub static LINT: &Lint = &Lint {
Expand Down
8 changes: 4 additions & 4 deletions ...es/text_direction_codepoint_in_comment.rs → ...es/text_direction_codepoint_in_comment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ use super::CORRECTNESS;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::MaybePackage;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::ManifestFor;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::ManifestFor;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "text_direction_codepoint_in_comment",
Expand Down
8 changes: 4 additions & 4 deletions ...es/text_direction_codepoint_in_literal.rs → ...es/text_direction_codepoint_in_literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ use super::CORRECTNESS;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::MaybePackage;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::ManifestFor;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::ManifestFor;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "text_direction_codepoint_in_literal",
Expand Down
10 changes: 5 additions & 5 deletions src/cargo/lints/rules/unknown_lints.rs → src/cargo/diagnostics/rules/unknown_lints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ use super::SUSPICIOUS;
use super::find_lint_or_group;
use crate::CargoResult;
use crate::GlobalContext;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::ManifestFor;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::ManifestFor;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "unknown_lints",
Expand Down
8 changes: 4 additions & 4 deletions src/cargo/lints/rules/unused_dependencies.rs → .../diagnostics/rules/unused_dependencies.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ use super::STYLE;
use crate::CargoResult;
use crate::GlobalContext;
use crate::core::Package;
use crate::lints::Lint;
use crate::lints::LintLevel;
use crate::lints::get_key_value_span;
use crate::lints::rel_cwd_manifest_path;
use crate::diagnostics::Lint;
use crate::diagnostics::LintLevel;
use crate::diagnostics::get_key_value_span;
use crate::diagnostics::rel_cwd_manifest_path;

pub static LINT: &Lint = &Lint {
name: "unused_dependencies",
Expand Down
Loading
Loading