refactor(lint): wrapper for lints against both pkg and workspace

Author: weihanglo

src/cargo/core/workspace.rs

@@ -1297,7 +1297,13 @@ impl<'gctx> Workspace<'gctx> {
                 self.gctx,
             )?;
             check_im_a_teapot(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
-            implicit_minimum_version_req(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
+            implicit_minimum_version_req(
+                pkg.into(),
+                &path,
+                &cargo_lints,
+                &mut error_count,
+                self.gctx,
+            )?;
         }
 
         if error_count > 0 {

src/cargo/util/lints/implicit_minimum_version_req.rs

@@ -18,6 +18,7 @@ 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;
 
@@ -79,26 +80,39 @@ serde = "1.0.219"
 };
 
 pub fn implicit_minimum_version_req(
-    pkg: &Package,
+    manifest: ManifestFor<'_>,
     manifest_path: &Path,
     cargo_lints: &TomlToolLints,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
-    let manifest = pkg.manifest();
-    let (lint_level, reason) = LINT.level(
-        cargo_lints,
-        manifest.edition(),
-        manifest.unstable_features(),
-    );
+    let (lint_level, reason) = manifest.lint_level(cargo_lints, LINT);
 
     if lint_level == LintLevel::Allow {
         return Ok(());
     }
 
+    let manifest_path = rel_cwd_manifest_path(manifest_path, gctx);
+
+    match manifest {
+        ManifestFor::Package(pkg) => {
+            lint_package(pkg, manifest_path, lint_level, reason, error_count, gctx)
+        }
+    }
+}
+
+pub fn lint_package(
+    pkg: &Package,
+    manifest_path: String,
+    lint_level: LintLevel,
+    reason: LintLevelReason,
+    error_count: &mut usize,
+    gctx: &GlobalContext,
+) -> CargoResult<()> {
+    let manifest = pkg.manifest();
+
     let document = manifest.document();
     let contents = manifest.contents();
-    let manifest_path = rel_cwd_manifest_path(manifest_path, gctx);
     let target_key_for_platform = target_key_for_platform(&manifest);
 
     for dep in manifest.dependencies().iter() {

src/cargo/util/lints/mod.rs

@@ -19,6 +19,30 @@ pub const LINTS: &[Lint] = &[
     UNKNOWN_LINTS,
 ];
 
+/// Scope at which a lint runs: package-level or workspace-level.
+pub enum ManifestFor<'a> {
+    /// Lint runs for a specific package.
+    Package(&'a Package),
+}
+
+impl ManifestFor<'_> {
+    fn lint_level(&self, pkg_lints: &TomlToolLints, lint: Lint) -> (LintLevel, LintLevelReason) {
+        match self {
+            ManifestFor::Package(p) => lint.level(
+                pkg_lints,
+                p.manifest().edition(),
+                p.manifest().unstable_features(),
+            ),
+        }
+    }
+}
+
+impl<'a> From<&'a Package> for ManifestFor<'a> {
+    fn from(value: &'a Package) -> ManifestFor<'a> {
+        ManifestFor::Package(value)
+    }
+}
+
 pub fn analyze_cargo_lints_table(
     pkg: &Package,
     path: &Path,