Support overwriting a foo.workspace = true with a dependency from a different source

Author: Muscraft

src/cargo/ops/cargo_add/dependency.rs

@@ -3,6 +3,7 @@ use std::fmt::{Display, Formatter};
 use std::path::{Path, PathBuf};
 
 use indexmap::IndexSet;
+use toml_edit::KeyMut;
 
 use super::manifest::str_or_1_len_table;
 use crate::core::FeatureMap;
@@ -476,10 +477,18 @@ impl Dependency {
     }
 
     /// Modify existing entry to match this dependency
-    pub fn update_toml(&self, crate_root: &Path, item: &mut toml_edit::Item) {
+    pub fn update_toml<'k>(
+        &self,
+        crate_root: &Path,
+        key: &mut KeyMut<'k>,
+        item: &mut toml_edit::Item,
+    ) {
         if str_or_1_len_table(item) {
             // Nothing to preserve
             *item = self.to_toml(crate_root);
+            if self.source != Some(Source::Workspace(WorkspaceSource)) {
+                key.fmt();
+            }
         } else if let Some(table) = item.as_table_like_mut() {
             match &self.source {
                 Some(Source::Registry(src)) => {

src/cargo/ops/cargo_add/manifest.rs

@@ -349,8 +349,12 @@ impl LocalManifest {
         let dep_key = dep.toml_key();
 
         let table = self.get_table_mut(table_path)?;
-        if let Some(dep_item) = table.as_table_like_mut().unwrap().get_mut(dep_key) {
-            dep.update_toml(&crate_root, dep_item);
+        if let Some((mut dep_key, dep_item)) = table
+            .as_table_like_mut()
+            .unwrap()
+            .get_key_value_mut(dep_key)
+        {
+            dep.update_toml(&crate_root, &mut dep_key, dep_item);
         } else {
             let new_dependency = dep.to_toml(&crate_root);
             table[dep_key] = new_dependency;

tests/snapshots/add/overwrite_workspace_dep.in/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency" }

tests/snapshots/add/overwrite_workspace_dep.in/dependency/Cargo.toml

@@ -0,0 +1,3 @@
+[package]
+name = "foo"
+version = "0.0.0"

tests/snapshots/add/overwrite_workspace_dep.in/dependency/src/lib.rs

@@ -0,0 +1,8 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"
+
+[dependencies]
+foo.workspace = true

tests/snapshots/add/overwrite_workspace_dep.in/primary/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["primary", "dependency"]
+
+[workspace.dependencies]
+foo = { version = "0.0.0", path = "./dependency" }

tests/snapshots/add/overwrite_workspace_dep.in/primary/src/lib.rs

@@ -0,0 +1,3 @@
+[package]
+name = "foo"
+version = "0.0.0"

tests/snapshots/add/overwrite_workspace_dep.out/Cargo.toml

@@ -0,0 +1,8 @@
+cargo-features = ["workspace-inheritance"]
+
+[package]
+name = "bar"
+version = "0.0.0"
+
+[dependencies]
+foo = { version = "0.0.0", path = "../dependency" }