Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_add/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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?;
}
Expand Down
63 changes: 63 additions & 0 deletions tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
use cargo_test_support::compare::assert_ui;
use cargo_test_support::prelude::*;
use cargo_test_support::Project;

use cargo_test_support::curr_dir;

#[cargo_test]
fn case() {
cargo_test_support::registry::init();

let main_manifest = r#"
[package]
name = "main-package"
version = "0.1.1+main-package"
authors = []

[workspace]
members = ["package-wo-feature", "package-with-feature"]
"#;

let manifest_feature = r#"
[package]
name = "package-with-feature"
version = "0.1.3+package-with-feature"
[features]
target_feature = []
"#;

let project = Project::from_template(curr_dir!().join("in"));
let project_root = project.root();
let cwd = &project_root;
let git_dep = cargo_test_support::git::new("git-package", |project| {
project
.file("Cargo.toml", &main_manifest)
.file(
"package-wo-feature/Cargo.toml",
&cargo_test_support::basic_manifest(
"package-wo-feature",
"0.1.1+package-wo-feature",
),
)
.file("package-wo-feature/src/lib.rs", "")
.file("package-with-feature/Cargo.toml", &manifest_feature)
.file("package-with-feature/src/lib.rs", "")
});
let git_url = git_dep.url().to_string();

snapbox::cmd::Command::cargo_ui()
.arg("add")
.args([
"--git",
&git_url,
"package-with-feature",
"--features=target_feature",
])
.current_dir(cwd)
.assert()
.success()
.stdout_matches_path(curr_dir!().join("stdout.log"))
.stderr_matches_path(curr_dir!().join("stderr.log"));

assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[workspace]

[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"] }
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Updating git repository `[ROOTURL]/git-package`
Adding package-with-feature (git) to dependencies.
Features:
+ target_feature
Updating git repository `[ROOTURL]/git-package`
Empty file.
1 change: 1 addition & 0 deletions tests/testsuite/cargo_add/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ mod git_dev;
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;
Expand Down