From e46d80e24ebf8504eec7b98463ff8f909e6cba3c Mon Sep 17 00:00:00 2001 From: sanchit Date: Fri, 29 Dec 2023 05:02:50 +0530 Subject: [PATCH] Fixes #13121: Use Exact query during populating features. Update test fix target output --- src/cargo/ops/cargo_add/mod.rs | 2 +- .../cargo_add/git_multiple_packages_features/mod.rs | 2 +- .../cargo_add/git_multiple_packages_features/out/Cargo.toml | 3 +++ .../cargo_add/git_multiple_packages_features/stderr.log | 5 +++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cargo/ops/cargo_add/mod.rs b/src/cargo/ops/cargo_add/mod.rs index 8409df732..51ad938f3 100644 --- a/src/cargo/ops/cargo_add/mod.rs +++ b/src/cargo/ops/cargo_add/mod.rs @@ -934,7 +934,7 @@ fn populate_available_features( } let possibilities = loop { - match registry.query_vec(&query, QueryKind::Fuzzy) { + match registry.query_vec(&query, QueryKind::Exact) { std::task::Poll::Ready(res) => { break res?; } diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs index 1b21cc97c..eb76b6f34 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs @@ -55,7 +55,7 @@ fn case() { ]) .current_dir(cwd) .assert() - .failure() + .success() .stdout_matches_path(curr_dir!().join("stdout.log")) .stderr_matches_path(curr_dir!().join("stderr.log")); diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/out/Cargo.toml b/tests/testsuite/cargo_add/git_multiple_packages_features/out/Cargo.toml index 3ecdb6681..939d81884 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/out/Cargo.toml +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/out/Cargo.toml @@ -3,3 +3,6 @@ [package] name = "cargo-list-test-fixture" version = "0.0.0" + +[dependencies] +package-with-feature = { git = "[ROOTURL]/git-package", version = "0.1.3", features = ["target_feature"] } diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log index ff940e212..3748cf9b0 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log @@ -1,4 +1,5 @@ Updating git repository `[ROOTURL]/git-package` Adding package-with-feature (git) to dependencies. -error: unrecognized feature for crate package-with-feature: target_feature -no features available for crate package-with-feature + Features: + + target_feature + Updating git repository `[ROOTURL]/git-package`