Skip to content

Commit

Permalink
Auto merge of #7419 - alexcrichton:fix-features-regression, r=ehuss
Browse files Browse the repository at this point in the history
Fix interpretation of `--features a b` on the CLI

Fixes an accidental regression from #7084 where `--features a b` was
erroneously mistinterpreted as `--features "a b"`.

Closes #7418
  • Loading branch information
bors committed Sep 24, 2019
2 parents 068a9b6 + 1fa02e7 commit aa6b7e0
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/cargo/util/command_prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ pub trait AppExt: Sized {
}

fn arg_features(self) -> Self {
self._arg(
opt("features", "Space-separated list of features to activate")
.multiple(true)
.value_name("FEATURES"),
)
self._arg(multi_opt(
"features",
"FEATURES",
"Space-separated list of features to activate",
))
._arg(opt("all-features", "Activate all available features"))
._arg(opt(
"no-default-features",
Expand Down
29 changes: 29 additions & 0 deletions tests/testsuite/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1959,3 +1959,32 @@ fn multi_multi_features() {

p.cargo("build --features a --features").arg("b c").run();
}

#[cargo_test]
fn cli_parse_ok() {
let p = project()
.file(
"Cargo.toml",
r#"
[project]
name = "foo"
version = "0.0.1"
authors = []
[features]
a = []
"#,
)
.file(
"src/main.rs",
r#"
#[cfg(feature = "a")]
fn main() {
assert_eq!(std::env::args().nth(1).unwrap(), "b");
}
"#,
)
.build();

p.cargo("run --features a b").run();
}

0 comments on commit aa6b7e0

Please sign in to comment.