From 4cc82833bde4d4f07e0e9e7f46a6985945d1de2d Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 24 Apr 2024 13:51:31 -0500
Subject: [PATCH 1/2] test(toml): Show default_features warning for workspace
 dependencies

---
 tests/testsuite/bad_config.rs | 84 +++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs
index e8fb1ad4065..51a967cae42 100644
--- a/tests/testsuite/bad_config.rs
+++ b/tests/testsuite/bad_config.rs
@@ -1355,6 +1355,90 @@ fn default_features2_conflict() {
         .run();
 }
 
+#[cargo_test]
+fn workspace_default_features2() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [workspace]
+                members = ["workspace_only", "dep_workspace_only", "package_only", "dep_package_only"]
+
+                [workspace.dependencies]
+                dep_workspace_only = { path = "dep_workspace_only", default_features = true }
+                dep_package_only = { path = "dep_package_only" }
+            "#,
+        )
+        .file(
+            "workspace_only/Cargo.toml",
+            r#"
+                [package]
+                name = "workspace_only"
+                version = "0.1.0"
+                edition = "2015"
+                authors = []
+
+                [dependencies]
+                dep_workspace_only.workspace = true
+            "#,
+        )
+        .file("workspace_only/src/lib.rs", "")
+        .file(
+            "dep_workspace_only/Cargo.toml",
+            r#"
+                [package]
+                name = "dep_workspace_only"
+                version = "0.1.0"
+                edition = "2015"
+                authors = []
+            "#,
+        )
+        .file("dep_workspace_only/src/lib.rs", "")
+        .file(
+            "package_only/Cargo.toml",
+            r#"
+                [package]
+                name = "package_only"
+                version = "0.1.0"
+                edition = "2015"
+                authors = []
+
+                [dependencies]
+                dep_package_only = { workspace = true, default_features = true }
+            "#,
+        )
+        .file("package_only/src/lib.rs", "")
+        .file(
+            "dep_package_only/Cargo.toml",
+            r#"
+                [package]
+                name = "dep_package_only"
+                version = "0.1.0"
+                edition = "2015"
+                authors = []
+            "#,
+        )
+        .file("dep_package_only/src/lib.rs", "")
+        .build();
+
+    p.cargo("check")
+        .with_stderr_unordered(
+            "\
+warning: [CWD]/workspace_only/Cargo.toml: `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition
+(in the `dep_workspace_only` dependency)
+warning: [CWD]/package_only/Cargo.toml: `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition
+(in the `dep_package_only` dependency)
+     Locking 4 packages to latest compatible versions
+    Checking dep_package_only v0.1.0 ([CWD]/dep_package_only)
+    Checking dep_workspace_only v0.1.0 ([CWD]/dep_workspace_only)
+    Checking package_only v0.1.0 ([CWD]/package_only)
+    Checking workspace_only v0.1.0 ([CWD]/workspace_only)
+    Finished `dev` profile [unoptimized + debuginfo] target(s) in [..]s
+"
+        )
+        .run();
+}
+
 #[cargo_test]
 fn proc_macro2() {
     let foo = project()

From 751fd47d346a127e4ccd5862cb6b67c32a1dfb56 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 24 Apr 2024 14:22:23 -0500
Subject: [PATCH 2/2] fix(toml): Don't double-warn when underscore is used in
 workspace dep

---
 src/cargo/util/toml/mod.rs    | 8 --------
 tests/testsuite/bad_config.rs | 2 --
 2 files changed, 10 deletions(-)

diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
index 16cba3cd3a2..a1d588f4eff 100644
--- a/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@ -904,14 +904,6 @@ fn inner_dependency_inherit_with<'a>(
                 this could become a hard error in the future"
         ))
     }
-    deprecated_underscore(
-        &dependency.default_features2,
-        &dependency.default_features,
-        "default-features",
-        name,
-        "dependency",
-        warnings,
-    );
     inherit()?.get_dependency(name, package_root).map(|d| {
         match d {
             manifest::TomlDependency::Simple(s) => {
diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs
index 51a967cae42..3b6d9b93d70 100644
--- a/tests/testsuite/bad_config.rs
+++ b/tests/testsuite/bad_config.rs
@@ -1426,8 +1426,6 @@ fn workspace_default_features2() {
             "\
 warning: [CWD]/workspace_only/Cargo.toml: `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition
 (in the `dep_workspace_only` dependency)
-warning: [CWD]/package_only/Cargo.toml: `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition
-(in the `dep_package_only` dependency)
      Locking 4 packages to latest compatible versions
     Checking dep_package_only v0.1.0 ([CWD]/dep_package_only)
     Checking dep_workspace_only v0.1.0 ([CWD]/dep_workspace_only)