fix(add): Don't select yanked versions when normalizing names (#14895)

### What does this PR try to resolve? Fixes #14893 In writing a test for this, I had a hard time finding the other tests as they mixed - Having an `add_` prefix - Calling this fuzzy vs normalized So I made the test names consistent ### How should we test and review this PR? ### Additional information
rust-lang · Dec 5, 2024 · 9e2c367 · 9e2c367
2 parents 0b3ad41 + 5df493e
commit 9e2c367
Show file tree

Hide file tree

Showing 50 changed files with 162 additions and 7 deletions.
diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs
@@ -856,7 +856,13 @@ impl<'gctx> Source for RegistrySource<'gctx> {
                     }
                     any_pending |= self
                         .index
-                        .query_inner(name_permutation, &req, &mut *self.ops, f)?
+                        .query_inner(name_permutation, &req, &mut *self.ops, &mut |s| {
+                            if !s.is_yanked() {
+                                f(s);
+                            } else if kind == QueryKind::Alternatives {
+                                f(s);
+                            }
+                        })?
                         .is_pending();
                 }
             }

diff --git a/tests/testsuite/cargo_add/mod.rs b/tests/testsuite/cargo_add/mod.rs
@@ -2,9 +2,7 @@ mod add_basic;
 mod add_multiple;
 mod add_no_vendored_package_with_alter_registry;
 mod add_no_vendored_package_with_vendor;
-mod add_normalized_name_external;
 mod add_toolchain;
-mod add_workspace_non_fuzzy;
 mod build;
 mod build_prefer_existing_version;
 mod change_rename_target;
@@ -14,7 +12,6 @@ mod deprecated_default_features;
 mod deprecated_section;
 mod detect_workspace_inherit;
 mod detect_workspace_inherit_features;
-mod detect_workspace_inherit_fuzzy;
 mod detect_workspace_inherit_optional;
 mod detect_workspace_inherit_path_base;
 mod detect_workspace_inherit_public;
@@ -28,7 +25,6 @@ mod features;
 mod features_activated_over_limit;
 mod features_deactivated_over_limit;
 mod features_empty;
-mod features_fuzzy;
 mod features_multiple_occurrences;
 mod features_preserve;
 mod features_spaced_values;
@@ -42,7 +38,6 @@ mod git_inferred_name;
 mod git_inferred_name_multiple;
 mod git_multiple_names;
 mod git_multiple_packages_features;
-mod git_normalized_name;
 mod git_registry;
 mod git_rev;
 mod git_tag;
@@ -75,6 +70,13 @@ mod no_args;
 mod no_default_features;
 mod no_optional;
 mod no_public;
+mod normalize_name_git;
+mod normalize_name_path;
+mod normalize_name_path_existing;
+mod normalize_name_registry;
+mod normalize_name_registry_existing;
+mod normalize_name_registry_yanked;
+mod normalize_name_workspace_dep;
 mod offline_empty_cache;
 mod optional;
 mod overwrite_default_features;
@@ -118,7 +120,6 @@ mod path_base_unstable;
 mod path_dev;
 mod path_inferred_name;
 mod path_inferred_name_conflicts_full_feature;
-mod path_normalized_name;
 mod preserve_dep_std_table;
 mod preserve_features_sorted;
 mod preserve_features_table;
@@ -149,3 +150,4 @@ mod vers;
 mod workspace_name;
 mod workspace_path;
 mod workspace_path_dev;
+mod yanked;
diff --git a/...cargo_add/add_normalized_name_external/in → ...testsuite/cargo_add/normalize_name_git/in b/...cargo_add/add_normalized_name_external/in → ...testsuite/cargo_add/normalize_name_git/in
diff --git a/...uite/cargo_add/git_normalized_name/mod.rs → ...suite/cargo_add/normalize_name_git/mod.rs b/...uite/cargo_add/git_normalized_name/mod.rs → ...suite/cargo_add/normalize_name_git/mod.rs
diff --git a/...go_add/git_normalized_name/out/Cargo.toml → ...rgo_add/normalize_name_git/out/Cargo.toml b/...go_add/git_normalized_name/out/Cargo.toml → ...rgo_add/normalize_name_git/out/Cargo.toml
diff --git a/...o_add/git_normalized_name/stderr.term.svg → ...go_add/normalize_name_git/stderr.term.svg b/...o_add/git_normalized_name/stderr.term.svg → ...go_add/normalize_name_git/stderr.term.svg
diff --git a/..._normalized_name/in/dependency/Cargo.toml → ...malize_name_path/in/dependency/Cargo.toml b/..._normalized_name/in/dependency/Cargo.toml → ...malize_name_path/in/dependency/Cargo.toml
diff --git a/...kspace_non_fuzzy/in/fuzzy_name/src/lib.rs → ...malize_name_path/in/dependency/src/lib.rs b/...kspace_non_fuzzy/in/fuzzy_name/src/lib.rs → ...malize_name_path/in/dependency/src/lib.rs
diff --git a/...ath_normalized_name/in/primary/Cargo.toml → ...normalize_name_path/in/primary/Cargo.toml b/...ath_normalized_name/in/primary/Cargo.toml → ...normalize_name_path/in/primary/Cargo.toml
diff --git a/...workspace_non_fuzzy/in/primary/src/lib.rs → ...normalize_name_path/in/primary/src/lib.rs b/...workspace_non_fuzzy/in/primary/src/lib.rs → ...normalize_name_path/in/primary/src/lib.rs
diff --git a/...ite/cargo_add/path_normalized_name/mod.rs → ...uite/cargo_add/normalize_name_path/mod.rs b/...ite/cargo_add/path_normalized_name/mod.rs → ...uite/cargo_add/normalize_name_path/mod.rs
diff --git a/...normalized_name/out/dependency/Cargo.toml → ...alize_name_path/out/dependency/Cargo.toml b/...normalized_name/out/dependency/Cargo.toml → ...alize_name_path/out/dependency/Cargo.toml
diff --git a/...th_normalized_name/out/primary/Cargo.toml → ...ormalize_name_path/out/primary/Cargo.toml b/...th_normalized_name/out/primary/Cargo.toml → ...ormalize_name_path/out/primary/Cargo.toml
diff --git a/..._add/path_normalized_name/stderr.term.svg → ...o_add/normalize_name_path/stderr.term.svg b/..._add/path_normalized_name/stderr.term.svg → ...o_add/normalize_name_path/stderr.term.svg
diff --git a/...add/add_workspace_non_fuzzy/in/Cargo.lock → ...ormalize_name_path_existing/in/Cargo.lock b/...add/add_workspace_non_fuzzy/in/Cargo.lock → ...ormalize_name_path_existing/in/Cargo.lock
diff --git a/...add/add_workspace_non_fuzzy/in/Cargo.toml → ...ormalize_name_path_existing/in/Cargo.toml b/...add/add_workspace_non_fuzzy/in/Cargo.toml → ...ormalize_name_path_existing/in/Cargo.toml
diff --git a/...kspace_non_fuzzy/in/fuzzy_name/Cargo.toml → ...me_path_existing/in/fuzzy_name/Cargo.toml b/...kspace_non_fuzzy/in/fuzzy_name/Cargo.toml → ...me_path_existing/in/fuzzy_name/Cargo.toml
diff --git a/...orkspace_non_fuzzy/out/primary/src/lib.rs → ...me_path_existing/in/fuzzy_name/src/lib.rs b/...orkspace_non_fuzzy/out/primary/src/lib.rs → ...me_path_existing/in/fuzzy_name/src/lib.rs
diff --git a/...workspace_non_fuzzy/in/primary/Cargo.toml → ..._name_path_existing/in/primary/Cargo.toml b/...workspace_non_fuzzy/in/primary/Cargo.toml → ..._name_path_existing/in/primary/Cargo.toml
diff --git a/...space_inherit_fuzzy/in/primary/src/lib.rs → ..._name_path_existing/in/primary/src/lib.rs b/...space_inherit_fuzzy/in/primary/src/lib.rs → ..._name_path_existing/in/primary/src/lib.rs
diff --git a/.../cargo_add/add_workspace_non_fuzzy/mod.rs → ...o_add/normalize_name_path_existing/mod.rs b/.../cargo_add/add_workspace_non_fuzzy/mod.rs → ...o_add/normalize_name_path_existing/mod.rs
diff --git a/...dd/add_workspace_non_fuzzy/out/Cargo.toml → ...rmalize_name_path_existing/out/Cargo.toml b/...dd/add_workspace_non_fuzzy/out/Cargo.toml → ...rmalize_name_path_existing/out/Cargo.toml
diff --git a/...orkspace_non_fuzzy/out/primary/Cargo.toml → ...name_path_existing/out/primary/Cargo.toml b/...orkspace_non_fuzzy/out/primary/Cargo.toml → ...name_path_existing/out/primary/Cargo.toml
diff --git a/...pace_inherit_fuzzy/out/primary/src/lib.rs → ...name_path_existing/out/primary/src/lib.rs b/...pace_inherit_fuzzy/out/primary/src/lib.rs → ...name_path_existing/out/primary/src/lib.rs
diff --git a/...d/add_workspace_non_fuzzy/stderr.term.svg → ...malize_name_path_existing/stderr.term.svg b/...d/add_workspace_non_fuzzy/stderr.term.svg → ...malize_name_path_existing/stderr.term.svg
diff --git a/...estsuite/cargo_add/git_normalized_name/in → ...uite/cargo_add/normalize_name_registry/in b/...estsuite/cargo_add/git_normalized_name/in → ...uite/cargo_add/normalize_name_registry/in
diff --git a/...o_add/add_normalized_name_external/mod.rs → .../cargo_add/normalize_name_registry/mod.rs b/...o_add/add_normalized_name_external/mod.rs → .../cargo_add/normalize_name_registry/mod.rs
diff --git a/...d_normalized_name_external/out/Cargo.toml → ...dd/normalize_name_registry/out/Cargo.toml b/...d_normalized_name_external/out/Cargo.toml → ...dd/normalize_name_registry/out/Cargo.toml
diff --git a/..._normalized_name_external/stderr.term.svg → ...d/normalize_name_registry/stderr.term.svg b/..._normalized_name_external/stderr.term.svg → ...d/normalize_name_registry/stderr.term.svg
diff --git a/...te/cargo_add/features_fuzzy/in/Cargo.toml → ...lize_name_registry_existing/in/Cargo.toml b/...te/cargo_add/features_fuzzy/in/Cargo.toml → ...lize_name_registry_existing/in/Cargo.toml
diff --git a/...te/cargo_add/features_fuzzy/in/src/lib.rs → ...lize_name_registry_existing/in/src/lib.rs b/...te/cargo_add/features_fuzzy/in/src/lib.rs → ...lize_name_registry_existing/in/src/lib.rs
diff --git a/...testsuite/cargo_add/features_fuzzy/mod.rs → ...d/normalize_name_registry_existing/mod.rs b/...testsuite/cargo_add/features_fuzzy/mod.rs → ...d/normalize_name_registry_existing/mod.rs
diff --git a/...e/cargo_add/features_fuzzy/out/Cargo.toml → ...ize_name_registry_existing/out/Cargo.toml b/...e/cargo_add/features_fuzzy/out/Cargo.toml → ...ize_name_registry_existing/out/Cargo.toml
diff --git a/.../cargo_add/features_fuzzy/stderr.term.svg → ...ze_name_registry_existing/stderr.term.svg b/.../cargo_add/features_fuzzy/stderr.term.svg → ...ze_name_registry_existing/stderr.term.svg
diff --git a/tests/testsuite/cargo_add/normalize_name_registry_yanked/in b/tests/testsuite/cargo_add/normalize_name_registry_yanked/in
@@ -0,0 +1 @@
+../add-basic.in
diff --git a/tests/testsuite/cargo_add/normalize_name_registry_yanked/mod.rs b/tests/testsuite/cargo_add/normalize_name_registry_yanked/mod.rs
@@ -0,0 +1,31 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
+use cargo_test_support::prelude::*;
+use cargo_test_support::str;
+use cargo_test_support::Project;
+
+#[cargo_test]
+fn case() {
+    cargo_test_support::registry::init();
+    cargo_test_support::registry::Package::new("linked-hash-map", "0.5.0").publish();
+    cargo_test_support::registry::Package::new("linked-hash-map", "0.5.4").publish();
+    cargo_test_support::registry::Package::new("linked-hash-map", "0.6.0")
+        .yanked(true)
+        .publish();
+
+    let project = Project::from_template(current_dir!().join("in"));
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo_ui()
+        .arg("add")
+        .arg_line("linked_hash_map")
+        .current_dir(cwd)
+        .assert()
+        .success()
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
+
+    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
+}
diff --git a/tests/testsuite/cargo_add/normalize_name_registry_yanked/out/Cargo.toml b/tests/testsuite/cargo_add/normalize_name_registry_yanked/out/Cargo.toml
@@ -0,0 +1,9 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+edition = "2015"
+
+[dependencies]
+linked-hash-map = "0.5.4"
diff --git a/tests/testsuite/cargo_add/normalize_name_registry_yanked/stderr.term.svg b/tests/testsuite/cargo_add/normalize_name_registry_yanked/stderr.term.svg
diff --git a/...ect_workspace_inherit_fuzzy/in/Cargo.toml → ...ormalize_name_workspace_dep/in/Cargo.toml b/...ect_workspace_inherit_fuzzy/in/Cargo.toml → ...ormalize_name_workspace_dep/in/Cargo.toml
diff --git a/...space_inherit_fuzzy/in/primary/Cargo.toml → ..._name_workspace_dep/in/primary/Cargo.toml b/...space_inherit_fuzzy/in/primary/Cargo.toml → ..._name_workspace_dep/in/primary/Cargo.toml
diff --git a/..._normalized_name/in/dependency/src/lib.rs → ..._name_workspace_dep/in/primary/src/lib.rs b/..._normalized_name/in/dependency/src/lib.rs → ..._name_workspace_dep/in/primary/src/lib.rs
diff --git a/...add/detect_workspace_inherit_fuzzy/mod.rs → ...o_add/normalize_name_workspace_dep/mod.rs b/...add/detect_workspace_inherit_fuzzy/mod.rs → ...o_add/normalize_name_workspace_dep/mod.rs
diff --git a/...ct_workspace_inherit_fuzzy/out/Cargo.toml → ...rmalize_name_workspace_dep/out/Cargo.toml b/...ct_workspace_inherit_fuzzy/out/Cargo.toml → ...rmalize_name_workspace_dep/out/Cargo.toml
diff --git a/...pace_inherit_fuzzy/out/primary/Cargo.toml → ...name_workspace_dep/out/primary/Cargo.toml b/...pace_inherit_fuzzy/out/primary/Cargo.toml → ...name_workspace_dep/out/primary/Cargo.toml
diff --git a/...ath_normalized_name/in/primary/src/lib.rs → ...name_workspace_dep/out/primary/src/lib.rs b/...ath_normalized_name/in/primary/src/lib.rs → ...name_workspace_dep/out/primary/src/lib.rs
diff --git a/...t_workspace_inherit_fuzzy/stderr.term.svg → ...malize_name_workspace_dep/stderr.term.svg b/...t_workspace_inherit_fuzzy/stderr.term.svg → ...malize_name_workspace_dep/stderr.term.svg
diff --git a/tests/testsuite/cargo_add/yanked/in b/tests/testsuite/cargo_add/yanked/in
@@ -0,0 +1 @@
+../add-basic.in
diff --git a/tests/testsuite/cargo_add/yanked/mod.rs b/tests/testsuite/cargo_add/yanked/mod.rs
@@ -0,0 +1,31 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
+use cargo_test_support::prelude::*;
+use cargo_test_support::str;
+use cargo_test_support::Project;
+
+#[cargo_test]
+fn case() {
+    cargo_test_support::registry::init();
+    cargo_test_support::registry::Package::new("linked-hash-map", "0.5.0").publish();
+    cargo_test_support::registry::Package::new("linked-hash-map", "0.5.4").publish();
+    cargo_test_support::registry::Package::new("linked-hash-map", "0.6.0")
+        .yanked(true)
+        .publish();
+
+    let project = Project::from_template(current_dir!().join("in"));
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo_ui()
+        .arg("add")
+        .arg_line("linked-hash-map")
+        .current_dir(cwd)
+        .assert()
+        .success()
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
+
+    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
+}
diff --git a/tests/testsuite/cargo_add/yanked/out/Cargo.toml b/tests/testsuite/cargo_add/yanked/out/Cargo.toml
@@ -0,0 +1,9 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+edition = "2015"
+
+[dependencies]
+linked-hash-map = "0.5.4"
diff --git a/tests/testsuite/cargo_add/yanked/stderr.term.svg b/tests/testsuite/cargo_add/yanked/stderr.term.svg