Auto merge of #13434 - epage:add-features, r=weihanglo

bors · bors · commit 53b5a5811309 · 2024-02-15T13:27:00.000Z
fix(add): Ensure users know a feature is being created Inspired by #13430 and #13411
diff --git a/src/cargo/ops/cargo_add/mod.rs b/src/cargo/ops/cargo_add/mod.rs
@@ -208,6 +208,10 @@ pub fn add(workspace: &Workspace<'_>, options: &AddOptions<'_>) -> CargoResult<(
                     let new_feature: toml_edit::Value =
                         [format!("dep:{dep_name}")].iter().collect();
                     table[dep_key] = toml_edit::value(new_feature);
+                    options
+                        .config
+                        .shell()
+                        .status("Adding", format!("feature `{dep_key}`"))?;
                 }
             }
         }
diff --git a/tests/testsuite/cargo_add/change_rename_target/stderr.log b/tests/testsuite/cargo_add/change_rename_target/stderr.log
@@ -1,2 +1,3 @@
     Updating `dummy-registry` index
       Adding my-package2 v99999.0.0 to optional dependencies.
+      Adding feature `some-package`
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log
@@ -1 +1,2 @@
       Adding foo (workspace) to optional dependencies.
+      Adding feature `foo`
diff --git a/tests/testsuite/cargo_add/optional/stderr.log b/tests/testsuite/cargo_add/optional/stderr.log
@@ -1,2 +1,3 @@
     Updating `dummy-registry` index
       Adding my-package v0.1.0 to optional dependencies.
+      Adding feature `my-package`
diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log
@@ -1 +1,2 @@
       Adding cargo-list-test-fixture-dependency (local) to optional dependencies.
+      Adding feature `cargo-list-test-fixture-dependency`
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log
@@ -1 +1,2 @@
       Adding foo (workspace) to optional dependencies.
+      Adding feature `foo`
diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log
@@ -2,3 +2,4 @@
              Features:
              + mouth
              + nose
+      Adding feature `your-face`
diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log
@@ -1,2 +1,3 @@
     Updating `dummy-registry` index
       Adding my-package v0.1.0 to optional dependencies.
+      Adding feature `my-package`
diff --git a/tests/testsuite/cargo_add/overwrite_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_optional/stderr.log
@@ -1,2 +1,3 @@
     Updating `dummy-registry` index
       Adding my-package v0.1.0 to optional dependencies.
+      Adding feature `my-package`
diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log
@@ -2,3 +2,4 @@
              Features:
              + mouth
              + nose
+      Adding feature `your-face`
diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log
@@ -1,2 +1,3 @@
     Updating `dummy-registry` index
       Adding cargo-list-test-fixture-dependency v20.0 to optional dependencies.
+      Adding feature `cargo-list-test-fixture-dependency`
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log
@@ -1,2 +1,3 @@
     Updating `dummy-registry` index
       Adding versioned-package v0.1.1 to optional dependencies.
+      Adding feature `a1`
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log
@@ -1,3 +1,4 @@
     Updating git repository `[ROOTURL]/versioned-package`
       Adding versioned-package (git) to optional dependencies.
+      Adding feature `versioned-package`
     Updating git repository `[ROOTURL]/versioned-package`
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log
@@ -1 +1,2 @@
       Adding cargo-list-test-fixture-dependency (local) to optional dependencies.
+      Adding feature `cargo-list-test-fixture-dependency`

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,10 @@ pub fn add(workspace: &Workspace<'_>, options: &AddOptions<'_>) -> CargoResult<(`
`208`	`208`	`let new_feature: toml_edit::Value =`
`209`	`209`	`[format!("dep:{dep_name}")].iter().collect();`
`210`	`210`	`table[dep_key] = toml_edit::value(new_feature);`
	`211`	`+ options`
	`212`	`+ .config`
	`213`	`+ .shell()`
	`214`	+ .status("Adding", format!("feature `{dep_key}`"))?;
`211`	`215`	`}`
`212`	`216`	`}`
`213`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	Updating `dummy-registry` index
`2`	`2`	`Adding my-package2 v99999.0.0 to optional dependencies.`
	`3`	+ Adding feature `some-package`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`Adding foo (workspace) to optional dependencies.`
	`2`	+ Adding feature `foo`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	Updating `dummy-registry` index
`2`	`2`	`Adding my-package v0.1.0 to optional dependencies.`
	`3`	+ Adding feature `my-package`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`Adding cargo-list-test-fixture-dependency (local) to optional dependencies.`
	`2`	+ Adding feature `cargo-list-test-fixture-dependency`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	Updating `dummy-registry` index
`2`	`2`	`Adding versioned-package v0.1.1 to optional dependencies.`
	`3`	+ Adding feature `a1`