From 76c09dc37452fd138e1564ba32594428462fa210 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Sun, 24 Mar 2024 12:32:17 -0600
Subject: [PATCH 1/3] refactor: Improve lint tests

---
 .../implicit_features/edition_2021/mod.rs     |  6 ++--
 .../edition_2021/stderr.term.svg              | 33 +++++++++++++++++++
 .../edition_2021_warn/mod.rs                  |  4 +--
 .../edition_2021_warn/stderr.term.svg         | 13 ++++++--
 .../implicit_features/edition_2024/mod.rs     |  2 +-
 .../lints/implicit_features/warn/mod.rs       |  4 +--
 .../implicit_features/warn/stderr.term.svg    | 13 ++++++--
 .../edition_2021/mod.rs                       |  6 ++--
 .../edition_2021/stderr.term.svg              | 33 +++++++++++++++++++
 .../edition_2021_warn/mod.rs                  |  4 +--
 .../edition_2021_warn/stderr.term.svg         | 13 ++++++--
 .../edition_2024/mod.rs                       |  3 +-
 .../lints/rust_2024_compatibility/warn/mod.rs |  4 +--
 .../warn/stderr.term.svg                      | 13 ++++++--
 14 files changed, 125 insertions(+), 26 deletions(-)
 create mode 100644 tests/testsuite/lints/implicit_features/edition_2021/stderr.term.svg
 create mode 100644 tests/testsuite/lints/rust_2024_compatibility/edition_2021/stderr.term.svg

diff --git a/tests/testsuite/lints/implicit_features/edition_2021/mod.rs b/tests/testsuite/lints/implicit_features/edition_2021/mod.rs
index ec43952e2b5..7ab75c6c7b8 100644
--- a/tests/testsuite/lints/implicit_features/edition_2021/mod.rs
+++ b/tests/testsuite/lints/implicit_features/edition_2021/mod.rs
@@ -1,7 +1,7 @@
 use cargo_test_support::prelude::*;
 use cargo_test_support::project;
 use cargo_test_support::registry::Package;
-use cargo_test_support::str;
+use cargo_test_support::{file, str};
 
 #[cargo_test]
 fn case() {
@@ -23,12 +23,10 @@ bar = { version = "0.1.0", optional = true }
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
         .current_dir(p.root())
         .arg("check")
-        .arg("--quiet")
         .assert()
         .success()
         .stdout_matches(str![""])
-        .stderr_matches(str![""]);
+        .stderr_matches(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/lints/implicit_features/edition_2021/stderr.term.svg b/tests/testsuite/lints/implicit_features/edition_2021/stderr.term.svg
new file mode 100644
index 00000000000..db900c0c4aa
--- /dev/null
+++ b/tests/testsuite/lints/implicit_features/edition_2021/stderr.term.svg
@@ -0,0 +1,33 @@
+<svg width="740px" height="110px" xmlns="http://www.w3.org/2000/svg">
+  <style>
+    .fg { fill: #AAAAAA }
+    .bg { background: #000000 }
+    .fg-green { fill: #00AA00 }
+    .container {
+      padding: 0 10px;
+      line-height: 18px;
+    }
+    .bold { font-weight: bold; }
+    tspan {
+      font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+      white-space: pre;
+      line-height: 18px;
+    }
+  </style>
+
+  <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-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
+</tspan>
+    <tspan x="10px" y="46px"><tspan class="fg-green bold">     Locking</tspan><tspan> 2 packages</tspan>
+</tspan>
+    <tspan x="10px" y="64px"><tspan class="fg-green bold">    Checking</tspan><tspan> foo v0.1.0 ([ROOT]/foo)</tspan>
+</tspan>
+    <tspan x="10px" y="82px"><tspan class="fg-green bold">    Finished</tspan><tspan>[..]</tspan>
+</tspan>
+    <tspan x="10px" y="100px">
+</tspan>
+  </text>
+
+</svg>
diff --git a/tests/testsuite/lints/implicit_features/edition_2021_warn/mod.rs b/tests/testsuite/lints/implicit_features/edition_2021_warn/mod.rs
index a18006072a2..32e4d7265dd 100644
--- a/tests/testsuite/lints/implicit_features/edition_2021_warn/mod.rs
+++ b/tests/testsuite/lints/implicit_features/edition_2021_warn/mod.rs
@@ -26,10 +26,10 @@ implicit-features = "warn"
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
+        .masquerade_as_nightly_cargo(&["cargo-lints"])
         .current_dir(p.root())
         .arg("check")
-        .arg("--quiet")
+        .arg("-Zcargo-lints")
         .assert()
         .success()
         .stdout_matches(str![""])
diff --git a/tests/testsuite/lints/implicit_features/edition_2021_warn/stderr.term.svg b/tests/testsuite/lints/implicit_features/edition_2021_warn/stderr.term.svg
index e41fb2b3535..3816d31ed75 100644
--- a/tests/testsuite/lints/implicit_features/edition_2021_warn/stderr.term.svg
+++ b/tests/testsuite/lints/implicit_features/edition_2021_warn/stderr.term.svg
@@ -1,8 +1,9 @@
-<svg width="740px" height="146px" xmlns="http://www.w3.org/2000/svg">
+<svg width="740px" height="218px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
     .fg-bright-blue { fill: #5555FF }
+    .fg-green { fill: #00AA00 }
     .fg-yellow { fill: #AA5500 }
     .container {
       padding: 0 10px;
@@ -31,7 +32,15 @@
 </tspan>
     <tspan x="10px" y="118px"><tspan class="fg-bright-blue bold">  |</tspan>
 </tspan>
-    <tspan x="10px" y="136px">
+    <tspan x="10px" y="136px"><tspan class="fg-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
+</tspan>
+    <tspan x="10px" y="154px"><tspan class="fg-green bold">     Locking</tspan><tspan> 2 packages</tspan>
+</tspan>
+    <tspan x="10px" y="172px"><tspan class="fg-green bold">    Checking</tspan><tspan> foo v0.1.0 ([ROOT]/foo)</tspan>
+</tspan>
+    <tspan x="10px" y="190px"><tspan class="fg-green bold">    Finished</tspan><tspan>[..]</tspan>
+</tspan>
+    <tspan x="10px" y="208px">
 </tspan>
   </text>
 
diff --git a/tests/testsuite/lints/implicit_features/edition_2024/mod.rs b/tests/testsuite/lints/implicit_features/edition_2024/mod.rs
index 62783bb449c..ebf0abfb70a 100644
--- a/tests/testsuite/lints/implicit_features/edition_2024/mod.rs
+++ b/tests/testsuite/lints/implicit_features/edition_2024/mod.rs
@@ -29,7 +29,7 @@ baz = ["dep:baz"]
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
+        .masquerade_as_nightly_cargo(&["edition2024"])
         .current_dir(p.root())
         .arg("check")
         .assert()
diff --git a/tests/testsuite/lints/implicit_features/warn/mod.rs b/tests/testsuite/lints/implicit_features/warn/mod.rs
index 387999a03c3..579fefc7ce0 100644
--- a/tests/testsuite/lints/implicit_features/warn/mod.rs
+++ b/tests/testsuite/lints/implicit_features/warn/mod.rs
@@ -27,10 +27,10 @@ implicit-features = "warn"
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
+        .masquerade_as_nightly_cargo(&["cargo-lints", "edition2024"])
         .current_dir(p.root())
         .arg("check")
-        .arg("--quiet")
+        .arg("-Zcargo-lints")
         .assert()
         .success()
         .stdout_matches(str![""])
diff --git a/tests/testsuite/lints/implicit_features/warn/stderr.term.svg b/tests/testsuite/lints/implicit_features/warn/stderr.term.svg
index 6dac803d6d3..fd5634add33 100644
--- a/tests/testsuite/lints/implicit_features/warn/stderr.term.svg
+++ b/tests/testsuite/lints/implicit_features/warn/stderr.term.svg
@@ -1,8 +1,9 @@
-<svg width="740px" height="146px" xmlns="http://www.w3.org/2000/svg">
+<svg width="740px" height="218px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
     .fg-bright-blue { fill: #5555FF }
+    .fg-green { fill: #00AA00 }
     .fg-yellow { fill: #AA5500 }
     .container {
       padding: 0 10px;
@@ -31,7 +32,15 @@
 </tspan>
     <tspan x="10px" y="118px"><tspan class="fg-bright-blue bold">  |</tspan>
 </tspan>
-    <tspan x="10px" y="136px">
+    <tspan x="10px" y="136px"><tspan class="fg-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
+</tspan>
+    <tspan x="10px" y="154px"><tspan class="fg-green bold">     Locking</tspan><tspan> 2 packages</tspan>
+</tspan>
+    <tspan x="10px" y="172px"><tspan class="fg-green bold">    Checking</tspan><tspan> foo v0.1.0 ([ROOT]/foo)</tspan>
+</tspan>
+    <tspan x="10px" y="190px"><tspan class="fg-green bold">    Finished</tspan><tspan>[..]</tspan>
+</tspan>
+    <tspan x="10px" y="208px">
 </tspan>
   </text>
 
diff --git a/tests/testsuite/lints/rust_2024_compatibility/edition_2021/mod.rs b/tests/testsuite/lints/rust_2024_compatibility/edition_2021/mod.rs
index ec43952e2b5..7ab75c6c7b8 100644
--- a/tests/testsuite/lints/rust_2024_compatibility/edition_2021/mod.rs
+++ b/tests/testsuite/lints/rust_2024_compatibility/edition_2021/mod.rs
@@ -1,7 +1,7 @@
 use cargo_test_support::prelude::*;
 use cargo_test_support::project;
 use cargo_test_support::registry::Package;
-use cargo_test_support::str;
+use cargo_test_support::{file, str};
 
 #[cargo_test]
 fn case() {
@@ -23,12 +23,10 @@ bar = { version = "0.1.0", optional = true }
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
         .current_dir(p.root())
         .arg("check")
-        .arg("--quiet")
         .assert()
         .success()
         .stdout_matches(str![""])
-        .stderr_matches(str![""]);
+        .stderr_matches(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/lints/rust_2024_compatibility/edition_2021/stderr.term.svg b/tests/testsuite/lints/rust_2024_compatibility/edition_2021/stderr.term.svg
new file mode 100644
index 00000000000..db900c0c4aa
--- /dev/null
+++ b/tests/testsuite/lints/rust_2024_compatibility/edition_2021/stderr.term.svg
@@ -0,0 +1,33 @@
+<svg width="740px" height="110px" xmlns="http://www.w3.org/2000/svg">
+  <style>
+    .fg { fill: #AAAAAA }
+    .bg { background: #000000 }
+    .fg-green { fill: #00AA00 }
+    .container {
+      padding: 0 10px;
+      line-height: 18px;
+    }
+    .bold { font-weight: bold; }
+    tspan {
+      font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+      white-space: pre;
+      line-height: 18px;
+    }
+  </style>
+
+  <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-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
+</tspan>
+    <tspan x="10px" y="46px"><tspan class="fg-green bold">     Locking</tspan><tspan> 2 packages</tspan>
+</tspan>
+    <tspan x="10px" y="64px"><tspan class="fg-green bold">    Checking</tspan><tspan> foo v0.1.0 ([ROOT]/foo)</tspan>
+</tspan>
+    <tspan x="10px" y="82px"><tspan class="fg-green bold">    Finished</tspan><tspan>[..]</tspan>
+</tspan>
+    <tspan x="10px" y="100px">
+</tspan>
+  </text>
+
+</svg>
diff --git a/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/mod.rs b/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/mod.rs
index 1c965df3734..73bdbcb0411 100644
--- a/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/mod.rs
+++ b/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/mod.rs
@@ -26,10 +26,10 @@ rust-2024-compatibility = "warn"
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
+        .masquerade_as_nightly_cargo(&["cargo-lints"])
         .current_dir(p.root())
         .arg("check")
-        .arg("--quiet")
+        .arg("-Zcargo-lints")
         .assert()
         .success()
         .stdout_matches(str![""])
diff --git a/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/stderr.term.svg b/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/stderr.term.svg
index e41fb2b3535..3816d31ed75 100644
--- a/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/stderr.term.svg
+++ b/tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/stderr.term.svg
@@ -1,8 +1,9 @@
-<svg width="740px" height="146px" xmlns="http://www.w3.org/2000/svg">
+<svg width="740px" height="218px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
     .fg-bright-blue { fill: #5555FF }
+    .fg-green { fill: #00AA00 }
     .fg-yellow { fill: #AA5500 }
     .container {
       padding: 0 10px;
@@ -31,7 +32,15 @@
 </tspan>
     <tspan x="10px" y="118px"><tspan class="fg-bright-blue bold">  |</tspan>
 </tspan>
-    <tspan x="10px" y="136px">
+    <tspan x="10px" y="136px"><tspan class="fg-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
+</tspan>
+    <tspan x="10px" y="154px"><tspan class="fg-green bold">     Locking</tspan><tspan> 2 packages</tspan>
+</tspan>
+    <tspan x="10px" y="172px"><tspan class="fg-green bold">    Checking</tspan><tspan> foo v0.1.0 ([ROOT]/foo)</tspan>
+</tspan>
+    <tspan x="10px" y="190px"><tspan class="fg-green bold">    Finished</tspan><tspan>[..]</tspan>
+</tspan>
+    <tspan x="10px" y="208px">
 </tspan>
   </text>
 
diff --git a/tests/testsuite/lints/rust_2024_compatibility/edition_2024/mod.rs b/tests/testsuite/lints/rust_2024_compatibility/edition_2024/mod.rs
index f17121b999c..37d73deb700 100644
--- a/tests/testsuite/lints/rust_2024_compatibility/edition_2024/mod.rs
+++ b/tests/testsuite/lints/rust_2024_compatibility/edition_2024/mod.rs
@@ -24,9 +24,10 @@ bar = { version = "0.1.0", optional = true }
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
+        .masquerade_as_nightly_cargo(&["edition2024"])
         .current_dir(p.root())
         .arg("check")
+        .arg("-Zcargo-lints")
         .assert()
         .code(101)
         .stdout_matches(str![""])
diff --git a/tests/testsuite/lints/rust_2024_compatibility/warn/mod.rs b/tests/testsuite/lints/rust_2024_compatibility/warn/mod.rs
index b8b2ee09148..41d30f6f456 100644
--- a/tests/testsuite/lints/rust_2024_compatibility/warn/mod.rs
+++ b/tests/testsuite/lints/rust_2024_compatibility/warn/mod.rs
@@ -27,10 +27,10 @@ rust-2024-compatibility = "warn"
         .build();
 
     snapbox::cmd::Command::cargo_ui()
-        .masquerade_as_nightly_cargo(&["always_nightly"])
+        .masquerade_as_nightly_cargo(&["cargo-lints", "edition2024"])
         .current_dir(p.root())
         .arg("check")
-        .arg("--quiet")
+        .arg("-Zcargo-lints")
         .assert()
         .success()
         .stdout_matches(str![""])
diff --git a/tests/testsuite/lints/rust_2024_compatibility/warn/stderr.term.svg b/tests/testsuite/lints/rust_2024_compatibility/warn/stderr.term.svg
index 6dac803d6d3..fd5634add33 100644
--- a/tests/testsuite/lints/rust_2024_compatibility/warn/stderr.term.svg
+++ b/tests/testsuite/lints/rust_2024_compatibility/warn/stderr.term.svg
@@ -1,8 +1,9 @@
-<svg width="740px" height="146px" xmlns="http://www.w3.org/2000/svg">
+<svg width="740px" height="218px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
     .fg-bright-blue { fill: #5555FF }
+    .fg-green { fill: #00AA00 }
     .fg-yellow { fill: #AA5500 }
     .container {
       padding: 0 10px;
@@ -31,7 +32,15 @@
 </tspan>
     <tspan x="10px" y="118px"><tspan class="fg-bright-blue bold">  |</tspan>
 </tspan>
-    <tspan x="10px" y="136px">
+    <tspan x="10px" y="136px"><tspan class="fg-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
+</tspan>
+    <tspan x="10px" y="154px"><tspan class="fg-green bold">     Locking</tspan><tspan> 2 packages</tspan>
+</tspan>
+    <tspan x="10px" y="172px"><tspan class="fg-green bold">    Checking</tspan><tspan> foo v0.1.0 ([ROOT]/foo)</tspan>
+</tspan>
+    <tspan x="10px" y="190px"><tspan class="fg-green bold">    Finished</tspan><tspan>[..]</tspan>
+</tspan>
+    <tspan x="10px" y="208px">
 </tspan>
   </text>
 

From d903995a8c2d5571738be8d592dad57f3c68d18a Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 25 Mar 2024 11:40:59 -0600
Subject: [PATCH 2/3] feat: Add unknown-lints lint

---
 src/cargo/core/workspace.rs                   |  33 +++--
 src/cargo/util/lints.rs                       | 125 +++++++++++++++++-
 tests/testsuite/lints/mod.rs                  |   1 +
 .../lints/unknown_lints/default/mod.rs        |  35 +++++
 .../unknown_lints/default/stderr.term.svg     |  55 ++++++++
 tests/testsuite/lints/unknown_lints/mod.rs    |   1 +
 tests/testsuite/lints_table.rs                |   3 -
 7 files changed, 238 insertions(+), 15 deletions(-)
 create mode 100644 tests/testsuite/lints/unknown_lints/default/mod.rs
 create mode 100644 tests/testsuite/lints/unknown_lints/default/stderr.term.svg
 create mode 100644 tests/testsuite/lints/unknown_lints/mod.rs

diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
index d05b802cf79..b36a2d2eccb 100644
--- a/src/cargo/core/workspace.rs
+++ b/src/cargo/core/workspace.rs
@@ -24,7 +24,7 @@ use crate::sources::{PathSource, CRATES_IO_INDEX, CRATES_IO_REGISTRY};
 use crate::util::edit_distance;
 use crate::util::errors::{CargoResult, ManifestError};
 use crate::util::interning::InternedString;
-use crate::util::lints::check_implicit_features;
+use crate::util::lints::{check_implicit_features, unknown_lints};
 use crate::util::toml::{read_manifest, InheritableFields};
 use crate::util::{context::ConfigRelativePath, Filesystem, GlobalContext, IntoUrl};
 use cargo_util::paths;
@@ -1098,9 +1098,7 @@ impl<'gctx> Workspace<'gctx> {
     pub fn emit_warnings(&self) -> CargoResult<()> {
         for (path, maybe_pkg) in &self.packages.packages {
             let path = path.join("Cargo.toml");
-            if let MaybePackage::Package(pkg) = maybe_pkg {
-                self.emit_lints(pkg, &path)?
-            }
+            self.emit_lints(maybe_pkg, &path)?;
             let warnings = match maybe_pkg {
                 MaybePackage::Package(pkg) => pkg.manifest().warnings().warnings(),
                 MaybePackage::Virtual(vm) => vm.warnings().warnings(),
@@ -1126,16 +1124,18 @@ impl<'gctx> Workspace<'gctx> {
         Ok(())
     }
 
-    pub fn emit_lints(&self, pkg: &Package, path: &Path) -> CargoResult<()> {
+    pub fn emit_lints(&self, maybe_pkg: &MaybePackage, path: &Path) -> CargoResult<()> {
         let mut error_count = 0;
-        let toml_lints = pkg
-            .manifest()
-            .resolved_toml()
+        let resolved_toml = match maybe_pkg {
+            MaybePackage::Package(p) => p.manifest().resolved_toml(),
+            MaybePackage::Virtual(vm) => vm.resolved_toml(),
+        };
+        let resolved_lints = resolved_toml
             .lints
             .clone()
             .map(|lints| lints.lints)
             .unwrap_or(manifest::TomlLints::default());
-        let cargo_lints = toml_lints
+        let cargo_lints = resolved_lints
             .get("cargo")
             .cloned()
             .unwrap_or(manifest::TomlToolLints::default());
@@ -1144,7 +1144,20 @@ impl<'gctx> Workspace<'gctx> {
             .map(|(name, lint)| (name.replace('-', "_"), lint))
             .collect();
 
-        check_implicit_features(pkg, &path, &normalized_lints, &mut error_count, self.gctx)?;
+        unknown_lints(
+            maybe_pkg,
+            &path,
+            &normalized_lints,
+            &mut error_count,
+            self.gctx,
+        )?;
+        check_implicit_features(
+            maybe_pkg,
+            &path,
+            &normalized_lints,
+            &mut error_count,
+            self.gctx,
+        )?;
         if error_count > 0 {
             Err(crate::util::errors::AlreadyPrintedError::new(anyhow!(
                 "encountered {error_count} errors(s) while running lints"
diff --git a/src/cargo/util/lints.rs b/src/cargo/util/lints.rs
index f2291f1b236..3f9f80ce518 100644
--- a/src/cargo/util/lints.rs
+++ b/src/cargo/util/lints.rs
@@ -1,5 +1,5 @@
 use crate::core::FeatureValue::Dep;
-use crate::core::{Edition, FeatureValue, Package};
+use crate::core::{Edition, FeatureValue, MaybePackage};
 use crate::util::interning::InternedString;
 use crate::{CargoResult, GlobalContext};
 use annotate_snippets::{Level, Renderer, Snippet};
@@ -58,6 +58,8 @@ fn rel_cwd_manifest_path(path: &Path, gctx: &GlobalContext) -> String {
         .to_string()
 }
 
+const LINT_GROUPS: &[LintGroup] = &[RUST_2024_COMPATIBILITY];
+
 #[derive(Copy, Clone, Debug)]
 pub struct LintGroup {
     pub name: &'static str,
@@ -136,6 +138,121 @@ impl From<TomlLintLevel> for LintLevel {
     }
 }
 
+const LINTS: &[Lint] = &[IMPLICIT_FEATURES, UNKNOWN_LINTS];
+
+const UNKNOWN_LINTS: Lint = Lint {
+    name: "unknown_lints",
+    desc: "detects unrecognized lint names",
+    groups: &[],
+    default_level: LintLevel::Warn,
+    edition_lint_opts: None,
+};
+
+pub fn unknown_lints(
+    maybe_pkg: &MaybePackage,
+    path: &Path,
+    resolved_lints: &TomlToolLints,
+    error_count: &mut usize,
+    gctx: &GlobalContext,
+) -> CargoResult<()> {
+    let edition = match maybe_pkg {
+        MaybePackage::Package(pkg) => pkg.manifest().edition(),
+        MaybePackage::Virtual(_) => Edition::default(),
+    };
+
+    let lint_level = UNKNOWN_LINTS.level(resolved_lints, edition);
+    if lint_level == LintLevel::Allow {
+        return Ok(());
+    }
+
+    let original_toml = match maybe_pkg {
+        MaybePackage::Package(pkg) => pkg.manifest().original_toml(),
+        MaybePackage::Virtual(vm) => vm.original_toml(),
+    };
+
+    let contents = match maybe_pkg {
+        MaybePackage::Package(pkg) => pkg.manifest().contents(),
+        MaybePackage::Virtual(vm) => vm.contents(),
+    };
+
+    let document = match maybe_pkg {
+        MaybePackage::Package(pkg) => pkg.manifest().document(),
+        MaybePackage::Virtual(vm) => vm.document(),
+    };
+
+    let renderer = Renderer::styled().term_width(
+        gctx.shell()
+            .err_width()
+            .diagnostic_terminal_width()
+            .unwrap_or(annotate_snippets::renderer::DEFAULT_TERM_WIDTH),
+    );
+    let level = lint_level.to_diagnostic_level();
+    let manifest_path = rel_cwd_manifest_path(path, gctx);
+
+    let all_names = LINTS
+        .iter()
+        .map(|lint| lint.name)
+        .chain(LINT_GROUPS.iter().map(|group| group.name))
+        .collect::<HashSet<_>>();
+
+    if let Some(lints) = original_toml
+        .workspace
+        .as_ref()
+        .map_or(&None, |ws| &ws.lints)
+    {
+        if let Some(cargo_lints) = lints.get("cargo") {
+            for (name, _) in cargo_lints.iter() {
+                let normalized_name = name.replace("-", "_");
+                if all_names.contains(normalized_name.as_str()) {
+                    continue;
+                }
+                if lint_level == LintLevel::Forbid || lint_level == LintLevel::Deny {
+                    *error_count += 1;
+                }
+                let title = format!("unknown lint: `{}`", name);
+                let message = level.title(&title).snippet(
+                    Snippet::source(contents)
+                        .origin(&manifest_path)
+                        .annotation(
+                            level.span(
+                                get_span(document, &["workspace", "lints", "cargo", name], false)
+                                    .unwrap(),
+                            ),
+                        )
+                        .fold(true),
+                );
+                writeln!(gctx.shell().err(), "{}", renderer.render(message))?;
+            }
+        }
+    }
+
+    if let Some(lints) = original_toml.lints.as_ref().map(|l| &l.lints) {
+        if let Some(cargo_lints) = lints.get("cargo") {
+            for (name, _) in cargo_lints.iter() {
+                let normalized_name = name.replace("-", "_");
+                if all_names.contains(normalized_name.as_str()) {
+                    continue;
+                }
+                if lint_level == LintLevel::Forbid || lint_level == LintLevel::Deny {
+                    *error_count += 1;
+                }
+                let title = format!("unknown lint: `{}`", name);
+                let message =
+                    level.title(&title).snippet(
+                        Snippet::source(contents)
+                            .origin(&manifest_path)
+                            .annotation(level.span(
+                                get_span(document, &["lints", "cargo", name], false).unwrap(),
+                            ))
+                            .fold(true),
+                    );
+                writeln!(gctx.shell().err(), "{}", renderer.render(message))?;
+            }
+        }
+    }
+    Ok(())
+}
+
 /// By default, cargo will treat any optional dependency as a [feature]. As of
 /// cargo 1.60, these can be disabled by declaring a feature that activates the
 /// optional dependency as `dep:<name>` (see [RFC #3143]).
@@ -158,12 +275,16 @@ const IMPLICIT_FEATURES: Lint = Lint {
 };
 
 pub fn check_implicit_features(
-    pkg: &Package,
+    maybe_pkg: &MaybePackage,
     path: &Path,
     lints: &TomlToolLints,
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
+    let MaybePackage::Package(pkg) = maybe_pkg else {
+        return Ok(());
+    };
+
     let lint_level = IMPLICIT_FEATURES.level(lints, pkg.manifest().edition());
     if lint_level == LintLevel::Allow {
         return Ok(());
diff --git a/tests/testsuite/lints/mod.rs b/tests/testsuite/lints/mod.rs
index 600122e61cc..462de379d84 100644
--- a/tests/testsuite/lints/mod.rs
+++ b/tests/testsuite/lints/mod.rs
@@ -1,2 +1,3 @@
 mod implicit_features;
 mod rust_2024_compatibility;
+mod unknown_lints;
diff --git a/tests/testsuite/lints/unknown_lints/default/mod.rs b/tests/testsuite/lints/unknown_lints/default/mod.rs
new file mode 100644
index 00000000000..840c1aa0b9d
--- /dev/null
+++ b/tests/testsuite/lints/unknown_lints/default/mod.rs
@@ -0,0 +1,35 @@
+use cargo_test_support::prelude::*;
+use cargo_test_support::project;
+use cargo_test_support::{file, str};
+
+#[cargo_test]
+fn case() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+[workspace.lints.cargo]
+this-lint-does-not-exist-ws = "warn"
+
+[package]
+name = "foo"
+version = "0.1.0"
+edition = "2021"
+
+[lints.cargo]
+this-lint-does-not-exist = "warn"
+"#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    snapbox::cmd::Command::cargo_ui()
+        .masquerade_as_nightly_cargo(&["cargo-lints"])
+        .current_dir(p.root())
+        .arg("check")
+        .arg("-Zcargo-lints")
+        .assert()
+        .success()
+        .stdout_matches(str![""])
+        .stderr_matches(file!["stderr.term.svg"]);
+}
diff --git a/tests/testsuite/lints/unknown_lints/default/stderr.term.svg b/tests/testsuite/lints/unknown_lints/default/stderr.term.svg
new file mode 100644
index 00000000000..bb6f15403d2
--- /dev/null
+++ b/tests/testsuite/lints/unknown_lints/default/stderr.term.svg
@@ -0,0 +1,55 @@
+<svg width="740px" height="290px" xmlns="http://www.w3.org/2000/svg">
+  <style>
+    .fg { fill: #AAAAAA }
+    .bg { background: #000000 }
+    .fg-bright-blue { fill: #5555FF }
+    .fg-green { fill: #00AA00 }
+    .fg-yellow { fill: #AA5500 }
+    .container {
+      padding: 0 10px;
+      line-height: 18px;
+    }
+    .bold { font-weight: bold; }
+    tspan {
+      font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+      white-space: pre;
+      line-height: 18px;
+    }
+  </style>
+
+  <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-yellow bold">warning</tspan><tspan>: </tspan><tspan class="bold">unknown lint: `this-lint-does-not-exist-ws`</tspan>
+</tspan>
+    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> Cargo.toml:3:1</tspan>
+</tspan>
+    <tspan x="10px" y="64px"><tspan class="fg-bright-blue bold">  |</tspan>
+</tspan>
+    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">3 |</tspan><tspan> this-lint-does-not-exist-ws = "warn"</tspan>
+</tspan>
+    <tspan x="10px" y="100px"><tspan class="fg-bright-blue bold">  |</tspan><tspan class="fg-yellow bold"> ---------------------------</tspan>
+</tspan>
+    <tspan x="10px" y="118px"><tspan class="fg-bright-blue bold">  |</tspan>
+</tspan>
+    <tspan x="10px" y="136px"><tspan class="fg-yellow bold">warning</tspan><tspan>: </tspan><tspan class="bold">unknown lint: `this-lint-does-not-exist`</tspan>
+</tspan>
+    <tspan x="10px" y="154px"><tspan>  </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> Cargo.toml:11:1</tspan>
+</tspan>
+    <tspan x="10px" y="172px"><tspan class="fg-bright-blue bold">   |</tspan>
+</tspan>
+    <tspan x="10px" y="190px"><tspan class="fg-bright-blue bold">11 |</tspan><tspan> this-lint-does-not-exist = "warn"</tspan>
+</tspan>
+    <tspan x="10px" y="208px"><tspan class="fg-bright-blue bold">   |</tspan><tspan class="fg-yellow bold"> ------------------------</tspan>
+</tspan>
+    <tspan x="10px" y="226px"><tspan class="fg-bright-blue bold">   |</tspan>
+</tspan>
+    <tspan x="10px" y="244px"><tspan class="fg-green bold">    Checking</tspan><tspan> foo v0.1.0 ([ROOT]/foo)</tspan>
+</tspan>
+    <tspan x="10px" y="262px"><tspan class="fg-green bold">    Finished</tspan><tspan> [..]</tspan>
+</tspan>
+    <tspan x="10px" y="280px">
+</tspan>
+  </text>
+
+</svg>
diff --git a/tests/testsuite/lints/unknown_lints/mod.rs b/tests/testsuite/lints/unknown_lints/mod.rs
new file mode 100644
index 00000000000..fe6fa17edae
--- /dev/null
+++ b/tests/testsuite/lints/unknown_lints/mod.rs
@@ -0,0 +1 @@
+mod default;
diff --git a/tests/testsuite/lints_table.rs b/tests/testsuite/lints_table.rs
index 2f37063ae47..652fc7596bb 100644
--- a/tests/testsuite/lints_table.rs
+++ b/tests/testsuite/lints_table.rs
@@ -763,7 +763,6 @@ fn cargo_lints_nightly_required() {
                 authors = []
 
                 [lints.cargo]
-                "unused-features" = "deny"
             "#,
         )
         .file("src/lib.rs", "")
@@ -797,7 +796,6 @@ fn cargo_lints_no_z_flag() {
                 authors = []
 
                 [lints.cargo]
-                "unused-features" = "deny"
             "#,
         )
         .file("src/lib.rs", "")
@@ -830,7 +828,6 @@ fn cargo_lints_success() {
                 authors = []
 
                 [lints.cargo]
-                "unused-features" = "deny"
             "#,
         )
         .file("src/lib.rs", "")

From c3498bee2b2b34558e1cf1313371b3ab84c071a0 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 25 Mar 2024 13:37:54 -0600
Subject: [PATCH 3/3] refactor: Create methods on MaybePackage

---
 src/cargo/core/workspace.rs | 46 ++++++++++++++++++++++++++++++++-----
 src/cargo/util/lints.rs     | 25 ++++----------------
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
index b36a2d2eccb..980f684e18a 100644
--- a/src/cargo/core/workspace.rs
+++ b/src/cargo/core/workspace.rs
@@ -30,7 +30,7 @@ use crate::util::{context::ConfigRelativePath, Filesystem, GlobalContext, IntoUr
 use cargo_util::paths;
 use cargo_util::paths::normalize_path;
 use cargo_util_schemas::manifest;
-use cargo_util_schemas::manifest::RustVersion;
+use cargo_util_schemas::manifest::{RustVersion, TomlManifest};
 use cargo_util_schemas::manifest::{TomlDependency, TomlProfiles};
 use pathdiff::diff_paths;
 
@@ -119,6 +119,43 @@ pub enum MaybePackage {
     Virtual(VirtualManifest),
 }
 
+impl MaybePackage {
+    pub fn contents(&self) -> &str {
+        match self {
+            MaybePackage::Package(pkg) => pkg.manifest().contents(),
+            MaybePackage::Virtual(vm) => vm.contents(),
+        }
+    }
+
+    pub fn document(&self) -> &toml_edit::ImDocument<String> {
+        match self {
+            MaybePackage::Package(pkg) => pkg.manifest().document(),
+            MaybePackage::Virtual(vm) => vm.document(),
+        }
+    }
+
+    pub fn edition(&self) -> Edition {
+        match self {
+            MaybePackage::Package(p) => p.manifest().edition(),
+            MaybePackage::Virtual(_) => Edition::default(),
+        }
+    }
+
+    pub fn original_toml(&self) -> &TomlManifest {
+        match self {
+            MaybePackage::Package(pkg) => pkg.manifest().original_toml(),
+            MaybePackage::Virtual(vm) => vm.original_toml(),
+        }
+    }
+
+    pub fn resolved_toml(&self) -> &TomlManifest {
+        match self {
+            MaybePackage::Package(pkg) => pkg.manifest().resolved_toml(),
+            MaybePackage::Virtual(vm) => vm.resolved_toml(),
+        }
+    }
+}
+
 /// Configuration of a workspace in a manifest.
 #[derive(Debug, Clone)]
 pub enum WorkspaceConfig {
@@ -1126,11 +1163,8 @@ impl<'gctx> Workspace<'gctx> {
 
     pub fn emit_lints(&self, maybe_pkg: &MaybePackage, path: &Path) -> CargoResult<()> {
         let mut error_count = 0;
-        let resolved_toml = match maybe_pkg {
-            MaybePackage::Package(p) => p.manifest().resolved_toml(),
-            MaybePackage::Virtual(vm) => vm.resolved_toml(),
-        };
-        let resolved_lints = resolved_toml
+        let resolved_lints = maybe_pkg
+            .resolved_toml()
             .lints
             .clone()
             .map(|lints| lints.lints)
diff --git a/src/cargo/util/lints.rs b/src/cargo/util/lints.rs
index 3f9f80ce518..56ac1bea763 100644
--- a/src/cargo/util/lints.rs
+++ b/src/cargo/util/lints.rs
@@ -155,31 +155,14 @@ pub fn unknown_lints(
     error_count: &mut usize,
     gctx: &GlobalContext,
 ) -> CargoResult<()> {
-    let edition = match maybe_pkg {
-        MaybePackage::Package(pkg) => pkg.manifest().edition(),
-        MaybePackage::Virtual(_) => Edition::default(),
-    };
-
-    let lint_level = UNKNOWN_LINTS.level(resolved_lints, edition);
+    let lint_level = UNKNOWN_LINTS.level(resolved_lints, maybe_pkg.edition());
     if lint_level == LintLevel::Allow {
         return Ok(());
     }
 
-    let original_toml = match maybe_pkg {
-        MaybePackage::Package(pkg) => pkg.manifest().original_toml(),
-        MaybePackage::Virtual(vm) => vm.original_toml(),
-    };
-
-    let contents = match maybe_pkg {
-        MaybePackage::Package(pkg) => pkg.manifest().contents(),
-        MaybePackage::Virtual(vm) => vm.contents(),
-    };
-
-    let document = match maybe_pkg {
-        MaybePackage::Package(pkg) => pkg.manifest().document(),
-        MaybePackage::Virtual(vm) => vm.document(),
-    };
-
+    let original_toml = maybe_pkg.original_toml();
+    let contents = maybe_pkg.contents();
+    let document = maybe_pkg.document();
     let renderer = Renderer::styled().term_width(
         gctx.shell()
             .err_width()