Skip to content
Open
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
25 changes: 10 additions & 15 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -430,21 +430,16 @@ impl Args {

term::set_coloring(color.as_deref())?;

if ignore_unknown_features {
if features.is_empty() && include_features.is_empty() && group_features.is_empty() {
requires("--ignore-unknown-features", &[
"--features",
"--include-features",
"--group-features",
])?;
}
if !include_features.is_empty() {
let _guard = term::warn::scoped(false);
// TODO: implement
warn!(
"--ignore-unknown-features for --include-features is not fully implemented and may not work as intended"
);
}
if ignore_unknown_features
&& features.is_empty()
&& include_features.is_empty()
&& group_features.is_empty()
{
requires("--ignore-unknown-features", &[
"--features",
"--include-features",
"--group-features",
])?;
}
if !each_feature && !feature_powerset {
if optional_deps.is_some() {
Expand Down
11 changes: 11 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,17 @@ fn determine_kind(cx: &Context, id: PackageId, multiple_packages: bool) -> Optio
cx.include_features.iter().filter(filter).collect()
};

let features = features
.into_iter()
.filter(|feature| match feature {
Feature::Normal { name } => package.features.contains_key(name.as_str()),
Feature::Group { list, .. } => {
list.iter().any(|name| package.features.contains_key(name.as_str()))
}
Feature::Path { .. } => true,
})
.collect::<Vec<_>>();

if cx.each_feature {
if (pkg_features.normal().is_empty() && pkg_features.optional_deps().is_empty()
|| !cx.include_features.is_empty())
Expand Down
3 changes: 3 additions & 0 deletions tests/fixtures/include_features_ignore_unknown/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[workspace]
resolver = "2"
members = ["features-a-b", "features-a-c", "features-c-d"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "features-a-b"
version = "0.0.0"
publish = false

[features]
a = []
b = []
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "features-a-c"
version = "0.0.0"
publish = false

[features]
a = []
c = []
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "features-c-d"
version = "0.0.0"
publish = false

[features]
c = []
d = []
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

57 changes: 42 additions & 15 deletions tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -468,21 +468,6 @@ fn ignore_unknown_features_failure() {
or --group-features
",
);

cargo_hack([
"check",
"--ignore-unknown-features",
"--feature-powerset",
"--include-features",
"a",
])
.assert_success("real")
.stderr_contains(
"
--ignore-unknown-features for --include-features is not fully implemented and may not \
work as intended
",
);
}

#[test]
Expand Down Expand Up @@ -2068,3 +2053,45 @@ fn update_readme() {
let command = "cargo hack --help";
test_helper::doc::sync_command_output_to_markdown(path, "readme-long-help", command, new);
}

#[test]
fn include_features_ignore_unknown() {
cargo_hack([
"check",
"--each-feature",
"--include-features",
"a,b",
"--ignore-unknown-features",
])
.assert_success("include_features_ignore_unknown")
.stderr_contains(
"
running `cargo check --no-default-features --features a` on features-a-b (1/4)
running `cargo check --no-default-features --features b` on features-a-b (2/4)
running `cargo check --no-default-features --features a` on features-a-c (3/4)
running `cargo check` on features-c-d (4/4)
",
)
.stderr_not_contains("--features c")
.stderr_not_contains("--features d");

cargo_hack([
"check",
"--feature-powerset",
"--include-features",
"a,b",
"--ignore-unknown-features",
])
.assert_success("include_features_ignore_unknown")
.stderr_contains(
"
running `cargo check --no-default-features --features a,b` on features-a-b (1/5)
running `cargo check --no-default-features --features a` on features-a-b (2/5)
running `cargo check --no-default-features --features b` on features-a-b (3/5)
running `cargo check --no-default-features --features a` on features-a-c (4/5)
running `cargo check` on features-c-d (5/5)
",
)
.stderr_not_contains("--features c")
.stderr_not_contains("--features d");
}
Loading