From b17b78209d7ea52ca82dc2f29de50efb5b788a9f Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Mon, 8 Dec 2025 21:17:51 -0500
Subject: [PATCH 1/6] test(lint): bad lint but not inheriting

Cargo should always capture unknown/feature-gated lin at workspace level
---
 tests/testsuite/lints/mod.rs           | 37 ++++++++++++++++++++++++++
 tests/testsuite/lints/unknown_lints.rs | 36 +++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/tests/testsuite/lints/mod.rs b/tests/testsuite/lints/mod.rs
index a69da32155e..22c3292b6cb 100644
--- a/tests/testsuite/lints/mod.rs
+++ b/tests/testsuite/lints/mod.rs
@@ -327,6 +327,43 @@ workspace = true
         .run();
 }
 
+#[cargo_test]
+fn check_feature_gated_workspace_not_inherited() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+[workspace]
+members = ["foo"]
+
+[workspace.lints.cargo]
+im_a_teapot = { level = "warn", priority = 10 }
+test_dummy_unstable = { level = "forbid", priority = -1 }
+            "#,
+        )
+        .file(
+            "foo/Cargo.toml",
+            r#"
+[package]
+name = "foo"
+version = "0.0.1"
+edition = "2015"
+authors = []
+            "#,
+        )
+        .file("foo/src/lib.rs", "")
+        .build();
+
+    p.cargo("check -Zcargo-lints")
+        .masquerade_as_nightly_cargo(&["cargo-lints"])
+        .with_stderr_data(str![[r#"
+[CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
+"#]])
+        .run();
+}
+
 #[cargo_test(nightly, reason = "-Zrustc-unicode is unstable")]
 fn unicode_report() {
     let p = project()
diff --git a/tests/testsuite/lints/unknown_lints.rs b/tests/testsuite/lints/unknown_lints.rs
index f30edc3b105..acc8f69ff39 100644
--- a/tests/testsuite/lints/unknown_lints.rs
+++ b/tests/testsuite/lints/unknown_lints.rs
@@ -88,3 +88,39 @@ workspace = true
 "#]])
         .run();
 }
+
+#[cargo_test]
+fn not_inherited() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+[workspace]
+members = ["foo"]
+
+[workspace.lints.cargo]
+this-lint-does-not-exist = "warn"
+"#,
+        )
+        .file(
+            "foo/Cargo.toml",
+            r#"
+[package]
+name = "foo"
+version = "0.0.1"
+edition = "2015"
+authors = []
+            "#,
+        )
+        .file("foo/src/lib.rs", "")
+        .build();
+
+    p.cargo("check -Zcargo-lints")
+        .masquerade_as_nightly_cargo(&["cargo-lints"])
+        .with_stderr_data(str![[r#"
+[CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+
+"#]])
+        .run();
+}

From d49dca3bf27a1d69aff93c0519038cde6d5d287a Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Mon, 8 Dec 2025 20:48:56 -0500
Subject: [PATCH 2/6] refactor(lint): make arg name consistent

---
 src/cargo/util/lints/mod.rs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/cargo/util/lints/mod.rs b/src/cargo/util/lints/mod.rs
index 39cb38af525..14a1746e4fd 100644
--- a/src/cargo/util/lints/mod.rs
+++ b/src/cargo/util/lints/mod.rs
@@ -54,8 +54,8 @@ impl<'a> From<&'a MaybePackage> for ManifestFor<'a> {
 
 pub fn analyze_cargo_lints_table(
     pkg: &Package,
-    path: &Path,
-    pkg_lints: &TomlToolLints,
+    manifest_path: &Path,
+    cargo_lints: &TomlToolLints,
     ws_contents: &str,
     ws_document: &toml::Spanned<toml::de::DeTable<'static>>,
     ws_path: &Path,
@@ -63,10 +63,10 @@ pub fn analyze_cargo_lints_table(
 ) -> CargoResult<()> {
     let mut error_count = 0;
     let manifest = pkg.manifest();
-    let manifest_path = rel_cwd_manifest_path(path, gctx);
+    let manifest_path = rel_cwd_manifest_path(manifest_path, gctx);
     let ws_path = rel_cwd_manifest_path(ws_path, gctx);
     let mut unknown_lints = Vec::new();
-    for lint_name in pkg_lints.keys().map(|name| name) {
+    for lint_name in cargo_lints.keys().map(|name| name) {
         let Some((name, default_level, edition_lint_opts, feature_gate)) =
             find_lint_or_group(lint_name)
         else {
@@ -78,7 +78,7 @@ pub fn analyze_cargo_lints_table(
             name,
             *default_level,
             *edition_lint_opts,
-            pkg_lints,
+            cargo_lints,
             manifest.edition(),
         );
 
@@ -107,7 +107,7 @@ pub fn analyze_cargo_lints_table(
         unknown_lints,
         manifest,
         &manifest_path,
-        pkg_lints,
+        cargo_lints,
         ws_contents,
         ws_document,
         &ws_path,
@@ -705,15 +705,18 @@ fn output_unknown_lints(
     unknown_lints: Vec<&String>,
     manifest: &Manifest,
     manifest_path: &str,
-    pkg_lints: &TomlToolLints,
+    cargo_lints: &TomlToolLints,
     ws_contents: &str,
     ws_document: &toml::Spanned<toml::de::DeTable<'static>>,
     ws_path: &str,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
-    let (lint_level, reason) =
-        UNKNOWN_LINTS.level(pkg_lints, manifest.edition(), manifest.unstable_features());
+    let (lint_level, reason) = UNKNOWN_LINTS.level(
+        cargo_lints,
+        manifest.edition(),
+        manifest.unstable_features(),
+    );
     if lint_level == LintLevel::Allow {
         return Ok(());
     }

From e739958fb1d3cc5fedf8cf6247d7d8fb6f8fc9e2 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Mon, 8 Dec 2025 20:51:45 -0500
Subject: [PATCH 3/6] refactor(lint): bail outside lint logic

---
 src/cargo/core/workspace.rs                   | 28 +++++++++++++------
 src/cargo/util/lints/mod.rs                   | 14 +++-------
 .../testsuite/lints/inherited/stderr.term.svg |  4 +--
 tests/testsuite/lints/mod.rs                  |  4 +--
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
index a0bd9367d4b..f23ba5d2cf3 100644
--- a/src/cargo/core/workspace.rs
+++ b/src/cargo/core/workspace.rs
@@ -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()
@@ -1287,6 +1286,8 @@ impl<'gctx> Workspace<'gctx> {
         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,
                 &path,
@@ -1294,24 +1295,33 @@ impl<'gctx> Workspace<'gctx> {
                 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<()> {
diff --git a/src/cargo/util/lints/mod.rs b/src/cargo/util/lints/mod.rs
index 14a1746e4fd..8abc9f443cf 100644
--- a/src/cargo/util/lints/mod.rs
+++ b/src/cargo/util/lints/mod.rs
@@ -59,9 +59,9 @@ pub fn analyze_cargo_lints_table(
     ws_contents: &str,
     ws_document: &toml::Spanned<toml::de::DeTable<'static>>,
     ws_path: &Path,
+    error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
-    let mut error_count = 0;
     let manifest = pkg.manifest();
     let manifest_path = rel_cwd_manifest_path(manifest_path, gctx);
     let ws_path = rel_cwd_manifest_path(ws_path, gctx);
@@ -97,7 +97,7 @@ pub fn analyze_cargo_lints_table(
                 ws_contents,
                 ws_document,
                 &ws_path,
-                &mut error_count,
+                error_count,
                 gctx,
             )?;
         }
@@ -111,17 +111,11 @@ pub fn analyze_cargo_lints_table(
         ws_contents,
         ws_document,
         &ws_path,
-        &mut error_count,
+        error_count,
         gctx,
     )?;
 
-    if error_count > 0 {
-        Err(anyhow::anyhow!(
-            "encountered {error_count} errors(s) while verifying lints",
-        ))
-    } else {
-        Ok(())
-    }
+    Ok(())
 }
 
 fn find_lint_or_group<'a>(
diff --git a/tests/testsuite/lints/inherited/stderr.term.svg b/tests/testsuite/lints/inherited/stderr.term.svg
index 9fd203d10ff..17de625f894 100644
--- a/tests/testsuite/lints/inherited/stderr.term.svg
+++ b/tests/testsuite/lints/inherited/stderr.term.svg
@@ -1,7 +1,7 @@
 <svg width="818px" height="272px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
+    .bg { fill: #000000 }
     .fg-bright-blue { fill: #5555FF }
     .fg-bright-green { fill: #55FF55 }
     .fg-bright-red { fill: #FF5555 }
@@ -44,7 +44,7 @@
 </tspan>
     <tspan x="10px" y="226px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">----------------</tspan>
 </tspan>
-    <tspan x="10px" y="244px"><tspan class="fg-bright-red bold">error</tspan><tspan>: encountered 1 errors(s) while verifying lints</tspan>
+    <tspan x="10px" y="244px"><tspan class="fg-bright-red bold">error</tspan><tspan>: encountered 1 error while verifying lints</tspan>
 </tspan>
     <tspan x="10px" y="262px">
 </tspan>
diff --git a/tests/testsuite/lints/mod.rs b/tests/testsuite/lints/mod.rs
index 22c3292b6cb..39f0beb2fbc 100644
--- a/tests/testsuite/lints/mod.rs
+++ b/tests/testsuite/lints/mod.rs
@@ -257,7 +257,7 @@ im_a_teapot = "warn"
   | ^^^^^^^^^^^ this is behind `test-dummy-unstable`, which is not enabled
   |
   = [HELP] consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest
-[ERROR] encountered 1 errors(s) while verifying lints
+[ERROR] encountered 1 error while verifying lints
 
 "#]])
         .run();
@@ -321,7 +321,7 @@ workspace = true
   |
 9 | workspace = true
   | ----------------
-[ERROR] encountered 2 errors(s) while verifying lints
+[ERROR] encountered 2 errors while verifying lints
 
 "#]])
         .run();

From 148dd3342443f718569ab4d789a5454669cc91fa Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Mon, 8 Dec 2025 21:22:07 -0500
Subject: [PATCH 4/6] fix(lint): dont talk about ws inheritance when linting
 packages

---
 src/cargo/core/workspace.rs                   |   7 --
 src/cargo/util/lints/mod.rs                   | 102 +++++-------------
 tests/testsuite/lints/inherited/mod.rs        |   2 +-
 .../testsuite/lints/inherited/stderr.term.svg |  32 +-----
 tests/testsuite/lints/mod.rs                  |  28 +----
 tests/testsuite/lints/unknown_lints.rs        |  12 ---
 6 files changed, 32 insertions(+), 151 deletions(-)

diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
index f23ba5d2cf3..51de98fb298 100644
--- a/src/cargo/core/workspace.rs
+++ b/src/cargo/core/workspace.rs
@@ -1281,10 +1281,6 @@ 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;
 
@@ -1292,9 +1288,6 @@ impl<'gctx> Workspace<'gctx> {
                 pkg,
                 &path,
                 &cargo_lints,
-                ws_contents,
-                ws_document,
-                self.root_manifest(),
                 &mut verify_error_count,
                 self.gctx,
             )?;
diff --git a/src/cargo/util/lints/mod.rs b/src/cargo/util/lints/mod.rs
index 8abc9f443cf..65d55447750 100644
--- a/src/cargo/util/lints/mod.rs
+++ b/src/cargo/util/lints/mod.rs
@@ -56,15 +56,11 @@ pub fn analyze_cargo_lints_table(
     pkg: &Package,
     manifest_path: &Path,
     cargo_lints: &TomlToolLints,
-    ws_contents: &str,
-    ws_document: &toml::Spanned<toml::de::DeTable<'static>>,
-    ws_path: &Path,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
     let manifest = pkg.manifest();
     let manifest_path = rel_cwd_manifest_path(manifest_path, gctx);
-    let ws_path = rel_cwd_manifest_path(ws_path, gctx);
     let mut unknown_lints = Vec::new();
     for lint_name in cargo_lints.keys().map(|name| name) {
         let Some((name, default_level, edition_lint_opts, feature_gate)) =
@@ -94,9 +90,6 @@ pub fn analyze_cargo_lints_table(
                 feature_gate,
                 manifest,
                 &manifest_path,
-                ws_contents,
-                ws_document,
-                &ws_path,
                 error_count,
                 gctx,
             )?;
@@ -108,9 +101,6 @@ pub fn analyze_cargo_lints_table(
         manifest,
         &manifest_path,
         cargo_lints,
-        ws_contents,
-        ws_document,
-        &ws_path,
         error_count,
         gctx,
     )?;
@@ -150,12 +140,12 @@ fn verify_feature_enabled(
     feature_gate: &Feature,
     manifest: &Manifest,
     manifest_path: &str,
-    ws_contents: &str,
-    ws_document: &toml::Spanned<toml::de::DeTable<'static>>,
-    ws_path: &str,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
+    let document = manifest.document();
+    let contents = manifest.contents();
+
     if !manifest.unstable_features().is_enabled(feature_gate) {
         let dash_feature_name = feature_gate.name().replace("_", "-");
         let title = format!("use of unstable lint `{}`", lint_name);
@@ -163,48 +153,26 @@ fn verify_feature_enabled(
             "this is behind `{}`, which is not enabled",
             dash_feature_name
         );
-        let second_title = format!("`cargo::{}` was inherited", lint_name);
         let help = format!(
             "consider adding `cargo-features = [\"{}\"]` to the top of the manifest",
             dash_feature_name
         );
 
-        let (contents, path, span) = if let Some(span) =
-            get_key_value_span(manifest.document(), &["lints", "cargo", lint_name])
-        {
-            (manifest.contents(), manifest_path, span)
-        } else if let Some(lint_span) =
-            get_key_value_span(ws_document, &["workspace", "lints", "cargo", lint_name])
-        {
-            (ws_contents, ws_path, lint_span)
-        } else {
-            panic!("could not find `cargo::{lint_name}` in `[lints]`, or `[workspace.lints]` ")
+        let key_path = &["lints", "cargo", lint_name];
+        let Some(span) = get_key_value_span(document, key_path) else {
+            // This lint must be inherited from workspace.
+            // Will be handle separately at workspace level.
+            return Ok(());
         };
 
-        let mut report = Vec::new();
-        report.push(
-            Group::with_title(Level::ERROR.primary_title(title))
-                .element(
-                    Snippet::source(contents)
-                        .path(path)
-                        .annotation(AnnotationKind::Primary.span(span.key).label(label)),
-                )
-                .element(Level::HELP.message(help)),
-        );
-
-        if let Some(inherit_span) = get_key_value_span(manifest.document(), &["lints", "workspace"])
-        {
-            report.push(
-                Group::with_title(Level::NOTE.secondary_title(second_title)).element(
-                    Snippet::source(manifest.contents())
-                        .path(manifest_path)
-                        .annotation(
-                            AnnotationKind::Context
-                                .span(inherit_span.key.start..inherit_span.value.end),
-                        ),
-                ),
-            );
-        }
+        let report = [Level::ERROR
+            .primary_title(title)
+            .element(
+                Snippet::source(contents)
+                    .path(manifest_path)
+                    .annotation(AnnotationKind::Primary.span(span.key).label(label)),
+            )
+            .element(Level::HELP.message(help))];
 
         *error_count += 1;
         gctx.shell().print_report(&report, true)?;
@@ -700,9 +668,6 @@ fn output_unknown_lints(
     manifest: &Manifest,
     manifest_path: &str,
     cargo_lints: &TomlToolLints,
-    ws_contents: &str,
-    ws_document: &toml::Spanned<toml::de::DeTable<'static>>,
-    ws_path: &str,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
@@ -715,6 +680,9 @@ fn output_unknown_lints(
         return Ok(());
     }
 
+    let document = manifest.document();
+    let contents = manifest.contents();
+
     let level = lint_level.to_diagnostic_level();
     let mut emitted_source = None;
     for lint_name in unknown_lints {
@@ -722,7 +690,6 @@ fn output_unknown_lints(
             *error_count += 1;
         }
         let title = format!("{}: `{lint_name}`", UNKNOWN_LINTS.desc);
-        let second_title = format!("`cargo::{}` was inherited", lint_name);
         let underscore_lint_name = lint_name.replace("-", "_");
         let matching = if let Some(lint) = LINTS.iter().find(|l| l.name == underscore_lint_name) {
             Some((lint.name, "lint"))
@@ -734,22 +701,17 @@ fn output_unknown_lints(
         let help =
             matching.map(|(name, kind)| format!("there is a {kind} with a similar name: `{name}`"));
 
-        let (contents, path, span) = if let Some(span) =
-            get_key_value_span(manifest.document(), &["lints", "cargo", lint_name])
-        {
-            (manifest.contents(), manifest_path, span)
-        } else if let Some(lint_span) =
-            get_key_value_span(ws_document, &["workspace", "lints", "cargo", lint_name])
-        {
-            (ws_contents, ws_path, lint_span)
-        } else {
-            panic!("could not find `cargo::{lint_name}` in `[lints]`, or `[workspace.lints]` ")
+        let key_path = &["lints", "cargo", lint_name];
+        let Some(span) = get_key_value_span(document, key_path) else {
+            // This lint must be inherited from workspace.
+            // Will be handle separately at workspace level.
+            return Ok(());
         };
 
         let mut report = Vec::new();
         let mut group = Group::with_title(level.clone().primary_title(title)).element(
             Snippet::source(contents)
-                .path(path)
+                .path(manifest_path)
                 .annotation(AnnotationKind::Primary.span(span.key)),
         );
         if emitted_source.is_none() {
@@ -761,20 +723,6 @@ fn output_unknown_lints(
         }
         report.push(group);
 
-        if let Some(inherit_span) = get_key_value_span(manifest.document(), &["lints", "workspace"])
-        {
-            report.push(
-                Group::with_title(Level::NOTE.secondary_title(second_title)).element(
-                    Snippet::source(manifest.contents())
-                        .path(manifest_path)
-                        .annotation(
-                            AnnotationKind::Context
-                                .span(inherit_span.key.start..inherit_span.value.end),
-                        ),
-                ),
-            );
-        }
-
         gctx.shell().print_report(&report, lint_level.force())?;
     }
 
diff --git a/tests/testsuite/lints/inherited/mod.rs b/tests/testsuite/lints/inherited/mod.rs
index 7d061183738..b080db11648 100644
--- a/tests/testsuite/lints/inherited/mod.rs
+++ b/tests/testsuite/lints/inherited/mod.rs
@@ -37,7 +37,7 @@ workspace = true
         .arg("check")
         .arg("-Zcargo-lints")
         .assert()
-        .code(101)
+        .success()
         .stdout_eq(str![""])
         .stderr_eq(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/lints/inherited/stderr.term.svg b/tests/testsuite/lints/inherited/stderr.term.svg
index 17de625f894..74d75514356 100644
--- a/tests/testsuite/lints/inherited/stderr.term.svg
+++ b/tests/testsuite/lints/inherited/stderr.term.svg
@@ -1,10 +1,8 @@
-<svg width="818px" height="272px" xmlns="http://www.w3.org/2000/svg">
+<svg width="740px" height="74px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { fill: #000000 }
-    .fg-bright-blue { fill: #5555FF }
     .fg-bright-green { fill: #55FF55 }
-    .fg-bright-red { fill: #FF5555 }
     .container {
       padding: 0 10px;
       line-height: 18px;
@@ -20,33 +18,11 @@
   <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
 
   <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error</tspan><tspan class="bold">: use of unstable lint `im_a_teapot`</tspan>
+    <tspan x="10px" y="28px"><tspan class="fg-bright-green bold">    Checking</tspan><tspan> foo v0.0.1 ([ROOT]/foo/foo)</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt; </tspan><tspan>Cargo.toml:6:1</tspan>
+    <tspan x="10px" y="46px"><tspan class="fg-bright-green bold">    Finished</tspan><tspan> </tspan><tspan><a href="https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles">`dev` profile [unoptimized + debuginfo]</a></tspan><tspan> target(s) in [ELAPSED]s</tspan>
 </tspan>
-    <tspan x="10px" y="64px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> im_a_teapot = { level = "warn", priority = 10 }</tspan>
-</tspan>
-    <tspan x="10px" y="100px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> </tspan><tspan class="fg-bright-red bold">^^^^^^^^^^^</tspan><tspan> </tspan><tspan class="fg-bright-red bold">this is behind `test-dummy-unstable`, which is not enabled</tspan>
-</tspan>
-    <tspan x="10px" y="118px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-    <tspan x="10px" y="136px"><tspan>  </tspan><tspan class="fg-bright-blue bold">= </tspan><tspan class="bold">help</tspan><tspan>: consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest</tspan>
-</tspan>
-    <tspan x="10px" y="154px"><tspan class="fg-bright-green bold">note</tspan><tspan>: `cargo::im_a_teapot` was inherited</tspan>
-</tspan>
-    <tspan x="10px" y="172px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt; </tspan><tspan>foo/Cargo.toml:9:1</tspan>
-</tspan>
-    <tspan x="10px" y="190px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-    <tspan x="10px" y="208px"><tspan class="fg-bright-blue bold">9</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> workspace = true</tspan>
-</tspan>
-    <tspan x="10px" y="226px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">----------------</tspan>
-</tspan>
-    <tspan x="10px" y="244px"><tspan class="fg-bright-red bold">error</tspan><tspan>: encountered 1 error while verifying lints</tspan>
-</tspan>
-    <tspan x="10px" y="262px">
+    <tspan x="10px" y="64px">
 </tspan>
   </text>
 
diff --git a/tests/testsuite/lints/mod.rs b/tests/testsuite/lints/mod.rs
index 39f0beb2fbc..190c0356c72 100644
--- a/tests/testsuite/lints/mod.rs
+++ b/tests/testsuite/lints/mod.rs
@@ -295,33 +295,9 @@ workspace = true
 
     p.cargo("check -Zcargo-lints")
         .masquerade_as_nightly_cargo(&["cargo-lints"])
-        .with_status(101)
         .with_stderr_data(str![[r#"
-[ERROR] use of unstable lint `im_a_teapot`
- --> Cargo.toml:6:1
-  |
-6 | im_a_teapot = { level = "warn", priority = 10 }
-  | ^^^^^^^^^^^ this is behind `test-dummy-unstable`, which is not enabled
-  |
-  = [HELP] consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest
-[NOTE] `cargo::im_a_teapot` was inherited
- --> foo/Cargo.toml:9:1
-  |
-9 | workspace = true
-  | ----------------
-[ERROR] use of unstable lint `test_dummy_unstable`
- --> Cargo.toml:7:1
-  |
-7 | test_dummy_unstable = { level = "forbid", priority = -1 }
-  | ^^^^^^^^^^^^^^^^^^^ this is behind `test-dummy-unstable`, which is not enabled
-  |
-  = [HELP] consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest
-[NOTE] `cargo::test_dummy_unstable` was inherited
- --> foo/Cargo.toml:9:1
-  |
-9 | workspace = true
-  | ----------------
-[ERROR] encountered 2 errors while verifying lints
+[CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
         .run();
diff --git a/tests/testsuite/lints/unknown_lints.rs b/tests/testsuite/lints/unknown_lints.rs
index acc8f69ff39..e4f2da0b49a 100644
--- a/tests/testsuite/lints/unknown_lints.rs
+++ b/tests/testsuite/lints/unknown_lints.rs
@@ -70,18 +70,6 @@ workspace = true
     p.cargo("check -Zcargo-lints")
         .masquerade_as_nightly_cargo(&["cargo-lints"])
         .with_stderr_data(str![[r#"
-[WARNING] unknown lint: `this-lint-does-not-exist`
- --> Cargo.toml:6:1
-  |
-6 | this-lint-does-not-exist = "warn"
-  | ^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = [NOTE] `cargo::unknown_lints` is set to `warn` by default
-[NOTE] `cargo::this-lint-does-not-exist` was inherited
- --> foo/Cargo.toml:9:1
-  |
-9 | workspace = true
-  | ----------------
 [CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 

From 614b619e947a498ab0b8ba0d393fcdf8efd0a6b6 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Tue, 9 Dec 2025 00:08:51 -0500
Subject: [PATCH 5/6] refactor(lint):  check feature enablement one level up

---
 src/cargo/util/lints/mod.rs | 62 ++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/cargo/util/lints/mod.rs b/src/cargo/util/lints/mod.rs
index 65d55447750..18526af8234 100644
--- a/src/cargo/util/lints/mod.rs
+++ b/src/cargo/util/lints/mod.rs
@@ -84,8 +84,10 @@ pub fn analyze_cargo_lints_table(
         }
 
         // Only run this on lints that are gated by a feature
-        if let Some(feature_gate) = feature_gate {
-            verify_feature_enabled(
+        if let Some(feature_gate) = feature_gate
+            && !manifest.unstable_features().is_enabled(feature_gate)
+        {
+            report_feature_not_enabled(
                 name,
                 feature_gate,
                 manifest,
@@ -135,7 +137,7 @@ fn find_lint_or_group<'a>(
     }
 }
 
-fn verify_feature_enabled(
+fn report_feature_not_enabled(
     lint_name: &str,
     feature_gate: &Feature,
     manifest: &Manifest,
@@ -145,38 +147,36 @@ fn verify_feature_enabled(
 ) -> CargoResult<()> {
     let document = manifest.document();
     let contents = manifest.contents();
+    let dash_feature_name = feature_gate.name().replace("_", "-");
+    let title = format!("use of unstable lint `{}`", lint_name);
+    let label = format!(
+        "this is behind `{}`, which is not enabled",
+        dash_feature_name
+    );
+    let help = format!(
+        "consider adding `cargo-features = [\"{}\"]` to the top of the manifest",
+        dash_feature_name
+    );
 
-    if !manifest.unstable_features().is_enabled(feature_gate) {
-        let dash_feature_name = feature_gate.name().replace("_", "-");
-        let title = format!("use of unstable lint `{}`", lint_name);
-        let label = format!(
-            "this is behind `{}`, which is not enabled",
-            dash_feature_name
-        );
-        let help = format!(
-            "consider adding `cargo-features = [\"{}\"]` to the top of the manifest",
-            dash_feature_name
-        );
+    let key_path = &["lints", "cargo", lint_name];
+    let Some(span) = get_key_value_span(document, key_path) else {
+        // This lint must be inherited from workspace.
+        // Will be handle separately at workspace level.
+        return Ok(());
+    };
 
-        let key_path = &["lints", "cargo", lint_name];
-        let Some(span) = get_key_value_span(document, key_path) else {
-            // This lint must be inherited from workspace.
-            // Will be handle separately at workspace level.
-            return Ok(());
-        };
+    let report = [Level::ERROR
+        .primary_title(title)
+        .element(
+            Snippet::source(contents)
+                .path(manifest_path)
+                .annotation(AnnotationKind::Primary.span(span.key).label(label)),
+        )
+        .element(Level::HELP.message(help))];
 
-        let report = [Level::ERROR
-            .primary_title(title)
-            .element(
-                Snippet::source(contents)
-                    .path(manifest_path)
-                    .annotation(AnnotationKind::Primary.span(span.key).label(label)),
-            )
-            .element(Level::HELP.message(help))];
+    *error_count += 1;
+    gctx.shell().print_report(&report, true)?;
 
-        *error_count += 1;
-        gctx.shell().print_report(&report, true)?;
-    }
     Ok(())
 }
 

From e5db075f20638f813910ada8fd2fb69503a59f96 Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Tue, 9 Dec 2025 00:52:10 -0500
Subject: [PATCH 6/6] fix(lints): handle lints separately at ws pkg level

`unknown_lints` is special that it analyzes only at package level,
and warn if your lint is inherited from workspace.

According to the discussion in
<https://github.com/rust-lang/cargo/pull/16321#discussion_r2586539709>,
we should lint against workspace always plus selected packages.

This additionally handles unstable lint gating.
---
 src/cargo/core/workspace.rs                   | 30 +++++---
 src/cargo/util/lints/mod.rs                   | 70 ++++++++++++-------
 tests/testsuite/lints/inherited/mod.rs        |  2 +-
 .../testsuite/lints/inherited/stderr.term.svg | 23 ++++--
 tests/testsuite/lints/mod.rs                  | 38 ++++++++--
 tests/testsuite/lints/unknown_lints.rs        | 14 ++++
 6 files changed, 135 insertions(+), 42 deletions(-)

diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
index 51de98fb298..5868b0aa71d 100644
--- a/src/cargo/core/workspace.rs
+++ b/src/cargo/core/workspace.rs
@@ -1285,7 +1285,7 @@ impl<'gctx> Workspace<'gctx> {
             let mut verify_error_count = 0;
 
             analyze_cargo_lints_table(
-                pkg,
+                pkg.into(),
                 &path,
                 &cargo_lints,
                 &mut verify_error_count,
@@ -1318,7 +1318,7 @@ impl<'gctx> Workspace<'gctx> {
     }
 
     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) => {
@@ -1342,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,
             )?;
         }
@@ -1360,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(())
         }
diff --git a/src/cargo/util/lints/mod.rs b/src/cargo/util/lints/mod.rs
index 18526af8234..8e7bc012b69 100644
--- a/src/cargo/util/lints/mod.rs
+++ b/src/cargo/util/lints/mod.rs
@@ -1,8 +1,10 @@
-use crate::core::{Edition, Feature, Features, Manifest, MaybePackage, Package};
+use crate::core::{Edition, Feature, Features, MaybePackage, Package};
 use crate::{CargoResult, GlobalContext};
+
 use annotate_snippets::{AnnotationKind, Group, Level, Patch, Snippet};
 use cargo_util_schemas::manifest::{ProfilePackageSpec, TomlLintLevel, TomlToolLints};
 use pathdiff::diff_paths;
+
 use std::borrow::Cow;
 use std::fmt::Display;
 use std::ops::Range;
@@ -29,13 +31,34 @@ pub enum ManifestFor<'a> {
 
 impl ManifestFor<'_> {
     fn lint_level(&self, pkg_lints: &TomlToolLints, lint: Lint) -> (LintLevel, LintLevelReason) {
+        lint.level(pkg_lints, self.edition(), self.unstable_features())
+    }
+
+    pub fn contents(&self) -> &str {
+        match self {
+            ManifestFor::Package(p) => p.manifest().contents(),
+            ManifestFor::Workspace(p) => p.contents(),
+        }
+    }
+
+    pub fn document(&self) -> &toml::Spanned<toml::de::DeTable<'static>> {
+        match self {
+            ManifestFor::Package(p) => p.manifest().document(),
+            ManifestFor::Workspace(p) => p.document(),
+        }
+    }
+
+    pub fn edition(&self) -> Edition {
+        match self {
+            ManifestFor::Package(p) => p.manifest().edition(),
+            ManifestFor::Workspace(p) => p.edition(),
+        }
+    }
+
+    pub fn unstable_features(&self) -> &Features {
         match self {
-            ManifestFor::Package(p) => lint.level(
-                pkg_lints,
-                p.manifest().edition(),
-                p.manifest().unstable_features(),
-            ),
-            ManifestFor::Workspace(p) => lint.level(pkg_lints, p.edition(), p.unstable_features()),
+            ManifestFor::Package(p) => p.manifest().unstable_features(),
+            ManifestFor::Workspace(p) => p.unstable_features(),
         }
     }
 }
@@ -53,13 +76,12 @@ impl<'a> From<&'a MaybePackage> for ManifestFor<'a> {
 }
 
 pub fn analyze_cargo_lints_table(
-    pkg: &Package,
+    manifest: ManifestFor<'_>,
     manifest_path: &Path,
     cargo_lints: &TomlToolLints,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
-    let manifest = pkg.manifest();
     let manifest_path = rel_cwd_manifest_path(manifest_path, gctx);
     let mut unknown_lints = Vec::new();
     for lint_name in cargo_lints.keys().map(|name| name) {
@@ -90,7 +112,7 @@ pub fn analyze_cargo_lints_table(
             report_feature_not_enabled(
                 name,
                 feature_gate,
-                manifest,
+                &manifest,
                 &manifest_path,
                 error_count,
                 gctx,
@@ -100,7 +122,7 @@ pub fn analyze_cargo_lints_table(
 
     output_unknown_lints(
         unknown_lints,
-        manifest,
+        &manifest,
         &manifest_path,
         cargo_lints,
         error_count,
@@ -140,7 +162,7 @@ fn find_lint_or_group<'a>(
 fn report_feature_not_enabled(
     lint_name: &str,
     feature_gate: &Feature,
-    manifest: &Manifest,
+    manifest: &ManifestFor<'_>,
     manifest_path: &str,
     error_count: &mut usize,
     gctx: &GlobalContext,
@@ -158,10 +180,12 @@ fn report_feature_not_enabled(
         dash_feature_name
     );
 
-    let key_path = &["lints", "cargo", lint_name];
+    let key_path = match manifest {
+        ManifestFor::Package(_) => &["lints", "cargo", lint_name][..],
+        ManifestFor::Workspace(_) => &["workspace", "lints", "cargo", lint_name][..],
+    };
     let Some(span) = get_key_value_span(document, key_path) else {
-        // This lint must be inherited from workspace.
-        // Will be handle separately at workspace level.
+        // This lint is handled by either package or workspace lint.
         return Ok(());
     };
 
@@ -665,17 +689,13 @@ this-lint-does-not-exist = "warn"
 
 fn output_unknown_lints(
     unknown_lints: Vec<&String>,
-    manifest: &Manifest,
+    manifest: &ManifestFor<'_>,
     manifest_path: &str,
     cargo_lints: &TomlToolLints,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
-    let (lint_level, reason) = UNKNOWN_LINTS.level(
-        cargo_lints,
-        manifest.edition(),
-        manifest.unstable_features(),
-    );
+    let (lint_level, reason) = manifest.lint_level(cargo_lints, UNKNOWN_LINTS);
     if lint_level == LintLevel::Allow {
         return Ok(());
     }
@@ -701,10 +721,12 @@ fn output_unknown_lints(
         let help =
             matching.map(|(name, kind)| format!("there is a {kind} with a similar name: `{name}`"));
 
-        let key_path = &["lints", "cargo", lint_name];
+        let key_path = match manifest {
+            ManifestFor::Package(_) => &["lints", "cargo", lint_name][..],
+            ManifestFor::Workspace(_) => &["workspace", "lints", "cargo", lint_name][..],
+        };
         let Some(span) = get_key_value_span(document, key_path) else {
-            // This lint must be inherited from workspace.
-            // Will be handle separately at workspace level.
+            // This lint is handled by either package or workspace lint.
             return Ok(());
         };
 
diff --git a/tests/testsuite/lints/inherited/mod.rs b/tests/testsuite/lints/inherited/mod.rs
index b080db11648..7d061183738 100644
--- a/tests/testsuite/lints/inherited/mod.rs
+++ b/tests/testsuite/lints/inherited/mod.rs
@@ -37,7 +37,7 @@ workspace = true
         .arg("check")
         .arg("-Zcargo-lints")
         .assert()
-        .success()
+        .code(101)
         .stdout_eq(str![""])
         .stderr_eq(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/lints/inherited/stderr.term.svg b/tests/testsuite/lints/inherited/stderr.term.svg
index 74d75514356..602c8523fa5 100644
--- a/tests/testsuite/lints/inherited/stderr.term.svg
+++ b/tests/testsuite/lints/inherited/stderr.term.svg
@@ -1,8 +1,9 @@
-<svg width="740px" height="74px" xmlns="http://www.w3.org/2000/svg">
+<svg width="818px" height="182px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { fill: #000000 }
-    .fg-bright-green { fill: #55FF55 }
+    .fg-bright-blue { fill: #5555FF }
+    .fg-bright-red { fill: #FF5555 }
     .container {
       padding: 0 10px;
       line-height: 18px;
@@ -18,11 +19,23 @@
   <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
 
   <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-bright-green bold">    Checking</tspan><tspan> foo v0.0.1 ([ROOT]/foo/foo)</tspan>
+    <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error</tspan><tspan class="bold">: use of unstable lint `im_a_teapot`</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan class="fg-bright-green bold">    Finished</tspan><tspan> </tspan><tspan><a href="https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles">`dev` profile [unoptimized + debuginfo]</a></tspan><tspan> target(s) in [ELAPSED]s</tspan>
+    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt; </tspan><tspan>Cargo.toml:6:1</tspan>
 </tspan>
-    <tspan x="10px" y="64px">
+    <tspan x="10px" y="64px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
+</tspan>
+    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">6</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> im_a_teapot = { level = "warn", priority = 10 }</tspan>
+</tspan>
+    <tspan x="10px" y="100px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> </tspan><tspan class="fg-bright-red bold">^^^^^^^^^^^</tspan><tspan> </tspan><tspan class="fg-bright-red bold">this is behind `test-dummy-unstable`, which is not enabled</tspan>
+</tspan>
+    <tspan x="10px" y="118px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
+</tspan>
+    <tspan x="10px" y="136px"><tspan>  </tspan><tspan class="fg-bright-blue bold">= </tspan><tspan class="bold">help</tspan><tspan>: consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest</tspan>
+</tspan>
+    <tspan x="10px" y="154px"><tspan class="fg-bright-red bold">error</tspan><tspan>: encountered 1 error while verifying lints</tspan>
+</tspan>
+    <tspan x="10px" y="172px">
 </tspan>
   </text>
 
diff --git a/tests/testsuite/lints/mod.rs b/tests/testsuite/lints/mod.rs
index 190c0356c72..ea2ddeb7137 100644
--- a/tests/testsuite/lints/mod.rs
+++ b/tests/testsuite/lints/mod.rs
@@ -139,6 +139,8 @@ fn dont_always_inherit_workspace_lints() {
         .file(
             "Cargo.toml",
             r#"
+cargo-features = ["test-dummy-unstable"]
+
 [workspace]
 members = ["foo"]
 
@@ -295,9 +297,23 @@ workspace = true
 
     p.cargo("check -Zcargo-lints")
         .masquerade_as_nightly_cargo(&["cargo-lints"])
+        .with_status(101)
         .with_stderr_data(str![[r#"
-[CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[ERROR] use of unstable lint `im_a_teapot`
+ --> Cargo.toml:6:1
+  |
+6 | im_a_teapot = { level = "warn", priority = 10 }
+  | ^^^^^^^^^^^ this is behind `test-dummy-unstable`, which is not enabled
+  |
+  = [HELP] consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest
+[ERROR] use of unstable lint `test_dummy_unstable`
+ --> Cargo.toml:7:1
+  |
+7 | test_dummy_unstable = { level = "forbid", priority = -1 }
+  | ^^^^^^^^^^^^^^^^^^^ this is behind `test-dummy-unstable`, which is not enabled
+  |
+  = [HELP] consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest
+[ERROR] encountered 2 errors while verifying lints
 
 "#]])
         .run();
@@ -332,9 +348,23 @@ authors = []
 
     p.cargo("check -Zcargo-lints")
         .masquerade_as_nightly_cargo(&["cargo-lints"])
+        .with_status(101)
         .with_stderr_data(str![[r#"
-[CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[ERROR] use of unstable lint `im_a_teapot`
+ --> Cargo.toml:6:1
+  |
+6 | im_a_teapot = { level = "warn", priority = 10 }
+  | ^^^^^^^^^^^ this is behind `test-dummy-unstable`, which is not enabled
+  |
+  = [HELP] consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest
+[ERROR] use of unstable lint `test_dummy_unstable`
+ --> Cargo.toml:7:1
+  |
+7 | test_dummy_unstable = { level = "forbid", priority = -1 }
+  | ^^^^^^^^^^^^^^^^^^^ this is behind `test-dummy-unstable`, which is not enabled
+  |
+  = [HELP] consider adding `cargo-features = ["test-dummy-unstable"]` to the top of the manifest
+[ERROR] encountered 2 errors while verifying lints
 
 "#]])
         .run();
diff --git a/tests/testsuite/lints/unknown_lints.rs b/tests/testsuite/lints/unknown_lints.rs
index e4f2da0b49a..c2a57cbebf6 100644
--- a/tests/testsuite/lints/unknown_lints.rs
+++ b/tests/testsuite/lints/unknown_lints.rs
@@ -70,6 +70,13 @@ workspace = true
     p.cargo("check -Zcargo-lints")
         .masquerade_as_nightly_cargo(&["cargo-lints"])
         .with_stderr_data(str![[r#"
+[WARNING] unknown lint: `this-lint-does-not-exist`
+ --> Cargo.toml:6:1
+  |
+6 | this-lint-does-not-exist = "warn"
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+  = [NOTE] `cargo::unknown_lints` is set to `warn` by default
 [CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
@@ -106,6 +113,13 @@ authors = []
     p.cargo("check -Zcargo-lints")
         .masquerade_as_nightly_cargo(&["cargo-lints"])
         .with_stderr_data(str![[r#"
+[WARNING] unknown lint: `this-lint-does-not-exist`
+ --> Cargo.toml:6:1
+  |
+6 | this-lint-does-not-exist = "warn"
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+  = [NOTE] `cargo::unknown_lints` is set to `warn` by default
 [CHECKING] foo v0.0.1 ([ROOT]/foo/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s