From 034ef3c27beeba3300c516c83fd1de99b5541f5d Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Mon, 22 Apr 2024 12:47:43 -0500
Subject: [PATCH] fix(toml): Be more forceful with underscore/dash redundancy

During #13783, I had considered making the 2024 edition behavior a
"unused key" warning.  However, I'm being too lazy in piping the data
through correctly (and a hard error might be better to help users
transition).
---
 src/cargo/util/toml/mod.rs    |  2 +-
 tests/testsuite/bad_config.rs | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
index 16cba3cd3a2..20a10ec2589 100644
--- a/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@ -2340,7 +2340,7 @@ fn deprecated_underscore<T>(
     if old.is_some() && new.is_some() {
         let old_path = new_path.replace("-", "_");
         warnings.push(format!(
-            "unused manifest key `{old_path}` in the `{name}` {kind}"
+            "`{old_path}` is redundant with `{new_path}`, preferring `{new_path}` in the `{name}` {kind}"
         ))
     } else if old.is_some() {
         let old_path = new_path.replace("-", "_");
diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs
index e8fb1ad4065..ff5e84b5984 100644
--- a/tests/testsuite/bad_config.rs
+++ b/tests/testsuite/bad_config.rs
@@ -873,7 +873,7 @@ fn dev_dependencies2_conflict() {
     p.cargo("check")
         .with_stderr_contains(
             "\
-[WARNING] unused manifest key `dev_dependencies` in the `foo` package
+[WARNING] `dev_dependencies` is redundant with `dev-dependencies`, preferring `dev-dependencies` in the `foo` package
 ",
         )
         .run();
@@ -948,7 +948,7 @@ fn build_dependencies2_conflict() {
     p.cargo("check")
         .with_stderr_contains(
             "\
-[WARNING] unused manifest key `build_dependencies` in the `foo` package
+[WARNING] `build_dependencies` is redundant with `build-dependencies`, preferring `build-dependencies` in the `foo` package
 ",
         )
         .run();
@@ -1006,7 +1006,7 @@ fn lib_crate_type2_conflict() {
     p.cargo("check")
         .with_stderr_contains(
             "\
-[WARNING] unused manifest key `crate_type` in the `foo` library target
+[WARNING] `crate_type` is redundant with `crate-type`, preferring `crate-type` in the `foo` library target
 ",
         )
         .run();
@@ -1101,8 +1101,8 @@ fn examples_crate_type2_conflict() {
     p.cargo("check")
         .with_stderr_contains(
             "\
-[WARNING] unused manifest key `crate_type` in the `ex` example target
-[WARNING] unused manifest key `crate_type` in the `goodbye` example target
+[WARNING] `crate_type` is redundant with `crate-type`, preferring `crate-type` in the `ex` example target
+[WARNING] `crate_type` is redundant with `crate-type`, preferring `crate-type` in the `goodbye` example target
 ",
         )
         .run();
@@ -1183,7 +1183,7 @@ fn cargo_platform_build_dependencies2_conflict() {
     p.cargo("check")
         .with_stderr_contains(format!(
             "\
-[WARNING] unused manifest key `build_dependencies` in the `{host}` platform target
+[WARNING] `build_dependencies` is redundant with `build-dependencies`, preferring `build-dependencies` in the `{host}` platform target
 "
         ))
         .run();
@@ -1262,7 +1262,7 @@ fn cargo_platform_dev_dependencies2_conflict() {
     p.cargo("check")
         .with_stderr_contains(format!(
             "\
-[WARNING] unused manifest key `dev_dependencies` in the `{host}` platform target
+[WARNING] `dev_dependencies` is redundant with `dev-dependencies`, preferring `dev-dependencies` in the `{host}` platform target
 "
         ))
         .run();
@@ -1349,7 +1349,7 @@ fn default_features2_conflict() {
     p.cargo("check")
         .with_stderr_contains(
             "\
-[WARNING] unused manifest key `default_features` in the `a` dependency
+[WARNING] `default_features` is redundant with `default-features`, preferring `default-features` in the `a` dependency
 ",
         )
         .run();
@@ -1403,7 +1403,7 @@ fn proc_macro2_conflict() {
     foo.cargo("check")
         .with_stderr_contains(
             "\
-[WARNING] unused manifest key `proc_macro` in the `foo` library target
+[WARNING] `proc_macro` is redundant with `proc-macro`, preferring `proc-macro` in the `foo` library target
 ",
         )
         .run();