itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix --feature pkg/feat for V1 resolver for non-member.

Browse Source
This commit is contained in:
Eric Huss 2021-03-14 19:05:12 -07:00
parent 5c8922ecf2
commit 6b320cb801
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cargo/core/workspace.rs
View File

@ -1091,7 +1091,8 @@ impl<'cfg> Workspace<'cfg> {
for feature in requested_features.features.iter() {
if let Some(index) = feature.find('/') {
let name = &feature[..index];
if specs.iter().any(|spec| spec.name() == name) {
let is_member = self.members().any(|member| member.name() == name);
if is_member && specs.iter().any(|spec| spec.name() == name) {
member_specific_features
.entry(name)
.or_default()

31
tests/testsuite/package_features.rs
View File

@ -458,3 +458,34 @@ fn resolver1_member_features() {
.with_stdout("m1-feature set")
.run();
}
#[cargo_test]
fn resolver1_non_member_optional_feature() {
// --features x/y for an optional dependency `x` with the v1 resolver.
Package::new("bar", "1.0.0")
.feature("feat1", &[])
.file(
"src/lib.rs",
r#"
#[cfg(not(feature = "feat1"))]
compile_error!("feat1 should be activated");
"#,
)
.publish();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = { version="1.0", optional=true }
"#,
)
.file("src/lib.rs", "")
.build();
p.cargo("check -p bar --features bar/feat1").run();
}