Fix rust-lang#10680

dohse · May 2, 2024 · 67f77a5 · 67f77a5
1 parent ea24eaa
commit 67f77a5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/cargo/ops/cargo_add/mod.rs b/src/cargo/ops/cargo_add/mod.rs
@@ -364,7 +364,24 @@ fn resolve_dependency(
     };
     selected_dep = populate_dependency(selected_dep, arg);
 
-    let old_dep = get_existing_dependency(manifest, selected_dep.toml_key(), section)?;
+    let mut old_dep = get_existing_dependency(manifest, selected_dep.toml_key(), section)?;
+    if old_dep.is_none() && selected_dep.source().is_none() && selected_dep.rename().is_none() {
+        for name_permutation in [
+            selected_dep.name.replace('-', "_"),
+            selected_dep.name.replace('_', "-"),
+        ] {
+            old_dep = get_existing_dependency(manifest, &name_permutation, section)?;
+            if old_dep.is_some() {
+                gctx.shell().warn(format!(
+                    "translating `{}` to `{}`",
+                    selected_dep.name, &name_permutation,
+                ))?;
+                selected_dep.name = name_permutation;
+                break;
+            }
+        }
+    }
+
     let mut dependency = if let Some(mut old_dep) = old_dep.clone() {
         if old_dep.name != selected_dep.name {
             // Assuming most existing keys are not relevant when the package changes

diff --git a/tests/testsuite/cargo_add/features_fuzzy/out/Cargo.toml b/tests/testsuite/cargo_add/features_fuzzy/out/Cargo.toml
@@ -6,4 +6,4 @@ version = "0.0.0"
 edition = "2015"
 
 [dependencies]
-your_face = { version = "99999.0.0" }
+your_face = { version = "99999.0.0", features = ["eyes"] }
diff --git a/tests/testsuite/cargo_add/features_fuzzy/stderr.term.svg b/tests/testsuite/cargo_add/features_fuzzy/stderr.term.svg