refactor(lints): move from cargo::util::lints to cargo::lints (#16392)

epage · web-flow · commit e91b2baa632c · 2025-12-13T16:29:21.000Z
### What does this PR try to resolve?

move lints module from `cargo::util::lints` to `cargo::lints`,
and also organize lints definitions under `rules/` module.

### How to test and review this PR?

r? Muscraft
diff --git a/crates/xtask-lint-docs/src/main.rs b/crates/xtask-lint-docs/src/main.rs
@@ -1,6 +1,8 @@
+use cargo::lints::Lint;
+use cargo::lints::LintLevel;
 use cargo::util::command_prelude::{ArgMatchesExt, flag};
-use cargo::util::lints::{Lint, LintLevel};
 use itertools::Itertools;
+
 use std::fmt::Write;
 use std::path::PathBuf;
 
@@ -18,10 +20,7 @@ fn main() -> anyhow::Result<()> {
     let mut forbid = Vec::new();
 
     let mut lint_docs = String::new();
-    for lint in cargo::util::lints::LINTS
-        .iter()
-        .sorted_by_key(|lint| lint.name)
-    {
+    for lint in cargo::lints::LINTS.iter().sorted_by_key(|lint| lint.name) {
         if lint.docs.is_some() {
             let sectipn = match lint.default_level {
                 LintLevel::Allow => &mut allow,
diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
@@ -92,19 +92,21 @@ pub use self::lto::Lto;
 use self::output_depinfo::output_depinfo;
 use self::output_sbom::build_sbom;
 use self::unit_graph::UnitDep;
+
 use crate::core::compiler::future_incompat::FutureIncompatReport;
 use crate::core::compiler::timings::SectionTiming;
 pub use crate::core::compiler::unit::{Unit, UnitInterner};
 use crate::core::manifest::TargetSourcePath;
 use crate::core::profiles::{PanicStrategy, Profile, StripInner};
 use crate::core::{Feature, PackageId, Target, Verbosity};
+use crate::lints::get_key_value;
 use crate::util::OnceExt;
 use crate::util::context::WarningHandling;
 use crate::util::errors::{CargoResult, VerboseError};
 use crate::util::interning::InternedString;
-use crate::util::lints::get_key_value;
 use crate::util::machine_message::{self, Message};
 use crate::util::{add_path_args, internal, path_args};
+
 use cargo_util::{ProcessBuilder, ProcessError, paths};
 use cargo_util_schemas::manifest::TomlDebugInfo;
 use cargo_util_schemas::manifest::TomlTrimPaths;
diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
@@ -20,21 +20,22 @@ use crate::core::{
     Dependency, Edition, FeatureValue, PackageId, PackageIdSpec, PackageIdSpecQuery,
 };
 use crate::core::{EitherManifest, Package, SourceId, VirtualManifest};
+use crate::lints::analyze_cargo_lints_table;
+use crate::lints::rules::blanket_hint_mostly_unused;
+use crate::lints::rules::check_im_a_teapot;
+use crate::lints::rules::implicit_minimum_version_req;
 use crate::ops;
 use crate::sources::{CRATES_IO_INDEX, CRATES_IO_REGISTRY, PathSource, SourceConfigMap};
 use crate::util::context::FeatureUnification;
 use crate::util::edit_distance;
 use crate::util::errors::{CargoResult, ManifestError};
 use crate::util::interning::InternedString;
-use crate::util::lints::analyze_cargo_lints_table;
-use crate::util::lints::blanket_hint_mostly_unused;
-use crate::util::lints::check_im_a_teapot;
-use crate::util::lints::implicit_minimum_version_req;
 use crate::util::toml::{InheritableFields, read_manifest};
 use crate::util::{
     Filesystem, GlobalContext, IntoUrl, context::CargoResolverConfig, context::ConfigRelativePath,
     context::IncompatibleRustVersions,
 };
+
 use cargo_util::paths;
 use cargo_util::paths::normalize_path;
 use cargo_util_schemas::manifest;
diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
@@ -155,6 +155,7 @@ pub const CARGO_ENV: &str = "CARGO";
 mod macros;
 
 pub mod core;
+pub mod lints;
 pub mod ops;
 pub mod sources;
 pub mod util;
diff --git a/src/cargo/lints/mod.rs b/src/cargo/lints/mod.rs
@@ -13,22 +13,10 @@ use std::fmt::Display;
 use std::ops::Range;
 use std::path::Path;
 
-mod blanket_hint_mostly_unused;
-pub use blanket_hint_mostly_unused::blanket_hint_mostly_unused;
-mod implicit_minimum_version_req;
-pub use implicit_minimum_version_req::implicit_minimum_version_req;
-mod im_a_teapot;
-pub use im_a_teapot::check_im_a_teapot;
-mod unknown_lints;
-use unknown_lints::output_unknown_lints;
+pub mod rules;
+pub use rules::LINTS;
 
 const LINT_GROUPS: &[LintGroup] = &[TEST_DUMMY_UNSTABLE];
-pub const LINTS: &[Lint] = &[
-    blanket_hint_mostly_unused::LINT,
-    implicit_minimum_version_req::LINT,
-    im_a_teapot::LINT,
-    unknown_lints::LINT,
-];
 
 /// Scope at which a lint runs: package-level or workspace-level.
 pub enum ManifestFor<'a> {
@@ -129,7 +117,7 @@ pub fn analyze_cargo_lints_table(
         }
     }
 
-    output_unknown_lints(
+    rules::output_unknown_lints(
         unknown_lints,
         &manifest,
         &manifest_path,
@@ -506,7 +494,7 @@ mod tests {
 
     #[test]
     fn ensure_updated_lints() {
-        let dir = snapbox::utils::current_dir!();
+        let dir = snapbox::utils::current_dir!().join("rules");
         let mut expected = HashSet::new();
         for entry in std::fs::read_dir(&dir).unwrap() {
             let entry = entry.unwrap();
diff --git a/src/cargo/lints/rules/blanket_hint_mostly_unused.rs b/src/cargo/lints/rules/blanket_hint_mostly_unused.rs
@@ -10,10 +10,10 @@ use cargo_util_schemas::manifest::TomlToolLints;
 use crate::CargoResult;
 use crate::GlobalContext;
 use crate::core::MaybePackage;
-use crate::util::lints::Lint;
-use crate::util::lints::LintLevel;
-use crate::util::lints::get_key_value_span;
-use crate::util::lints::rel_cwd_manifest_path;
+use crate::lints::Lint;
+use crate::lints::LintLevel;
+use crate::lints::get_key_value_span;
+use crate::lints::rel_cwd_manifest_path;
 
 pub const LINT: Lint = Lint {
     name: "blanket_hint_mostly_unused",
diff --git a/src/cargo/lints/rules/im_a_teapot.rs b/src/cargo/lints/rules/im_a_teapot.rs
@@ -10,11 +10,11 @@ use crate::CargoResult;
 use crate::GlobalContext;
 use crate::core::Feature;
 use crate::core::Package;
-use crate::util::lints::Lint;
-use crate::util::lints::LintLevel;
-use crate::util::lints::TEST_DUMMY_UNSTABLE;
-use crate::util::lints::get_key_value_span;
-use crate::util::lints::rel_cwd_manifest_path;
+use crate::lints::Lint;
+use crate::lints::LintLevel;
+use crate::lints::TEST_DUMMY_UNSTABLE;
+use crate::lints::get_key_value_span;
+use crate::lints::rel_cwd_manifest_path;
 
 /// This lint is only to be used for testing purposes
 pub const LINT: Lint = Lint {
diff --git a/src/cargo/lints/rules/implicit_minimum_version_req.rs b/src/cargo/lints/rules/implicit_minimum_version_req.rs
@@ -16,13 +16,13 @@ use crate::GlobalContext;
 use crate::core::Manifest;
 use crate::core::MaybePackage;
 use crate::core::Package;
+use crate::lints::Lint;
+use crate::lints::LintLevel;
+use crate::lints::LintLevelReason;
+use crate::lints::ManifestFor;
+use crate::lints::get_key_value;
+use crate::lints::rel_cwd_manifest_path;
 use crate::util::OptVersionReq;
-use crate::util::lints::Lint;
-use crate::util::lints::LintLevel;
-use crate::util::lints::LintLevelReason;
-use crate::util::lints::ManifestFor;
-use crate::util::lints::get_key_value;
-use crate::util::lints::rel_cwd_manifest_path;
 
 pub const LINT: Lint = Lint {
     name: "implicit_minimum_version_req",
diff --git a/src/cargo/lints/rules/mod.rs b/src/cargo/lints/rules/mod.rs
@@ -0,0 +1,16 @@
+mod blanket_hint_mostly_unused;
+mod im_a_teapot;
+mod implicit_minimum_version_req;
+mod unknown_lints;
+
+pub use blanket_hint_mostly_unused::blanket_hint_mostly_unused;
+pub use im_a_teapot::check_im_a_teapot;
+pub use implicit_minimum_version_req::implicit_minimum_version_req;
+pub use unknown_lints::output_unknown_lints;
+
+pub const LINTS: &[crate::lints::Lint] = &[
+    blanket_hint_mostly_unused::LINT,
+    implicit_minimum_version_req::LINT,
+    im_a_teapot::LINT,
+    unknown_lints::LINT,
+];
diff --git a/src/cargo/lints/rules/unknown_lints.rs b/src/cargo/lints/rules/unknown_lints.rs
@@ -6,12 +6,12 @@ use cargo_util_schemas::manifest::TomlToolLints;
 
 use crate::CargoResult;
 use crate::GlobalContext;
-use crate::util::lints::LINT_GROUPS;
-use crate::util::lints::LINTS;
-use crate::util::lints::Lint;
-use crate::util::lints::LintLevel;
-use crate::util::lints::ManifestFor;
-use crate::util::lints::get_key_value_span;
+use crate::lints::LINT_GROUPS;
+use crate::lints::LINTS;
+use crate::lints::Lint;
+use crate::lints::LintLevel;
+use crate::lints::ManifestFor;
+use crate::lints::get_key_value_span;
 
 pub const LINT: Lint = Lint {
     name: "unknown_lints",
diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs
@@ -54,7 +54,6 @@ pub mod into_url;
 mod into_url_with_base;
 mod io;
 pub mod job;
-pub mod lints;
 mod lockserver;
 pub mod log_message;
 pub mod logger;
diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
@@ -29,10 +29,11 @@ use crate::core::{CliUnstable, FeatureValue, find_workspace_root, resolve_relati
 use crate::core::{Dependency, Manifest, Package, PackageId, Summary, Target};
 use crate::core::{Edition, EitherManifest, Feature, Features, VirtualManifest, Workspace};
 use crate::core::{GitReference, PackageIdSpec, SourceId, WorkspaceConfig, WorkspaceRootConfig};
+use crate::lints::get_key_value_span;
+use crate::lints::rel_cwd_manifest_path;
 use crate::sources::{CRATES_IO_INDEX, CRATES_IO_REGISTRY};
 use crate::util::errors::{CargoResult, ManifestError};
 use crate::util::interning::InternedString;
-use crate::util::lints::{get_key_value_span, rel_cwd_manifest_path};
 use crate::util::{
     self, GlobalContext, IntoUrl, OnceExt, OptVersionReq, context::ConfigRelativePath,
     context::TOP_LEVEL_CONFIG_KEYS,
