Skip to content

Commit

Permalink
Auto merge of #11119 - epage:error, r=ehuss
Browse files Browse the repository at this point in the history
fix(cli): Error trailing args rather than ignore

This warning has been in for a sufficient time, requires a hack from clap to avoid all argument ID validation, and allows users to run the wrong command (imagine `cargo -- publish --dry-run`).

See also https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Cargo.20ignoring.20arguments.20with.20.60cargo.20--.20check.20--ignored.60
  • Loading branch information
bors committed Sep 21, 2022
2 parents 531ce13 + 8f8a79a commit e320c3e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
10 changes: 7 additions & 3 deletions src/bin/cargo/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,15 @@ fn expand_aliases(
(Some(_), None) => {
// Command is built-in and is not conflicting with alias, but contains ignored values.
if let Some(mut values) = args.get_many::<String>("") {
config.shell().warn(format!(
"trailing arguments after built-in command `{}` are ignored: `{}`",
return Err(anyhow::format_err!(
"\
trailing arguments after built-in command `{}` are unsupported: `{}`
To pass the arguments to the subcommand, remove `--`",
cmd,
values.join(" "),
))?;
)
.into());
}
}
(None, None) => {}
Expand Down
7 changes: 4 additions & 3 deletions tests/testsuite/cargo_alias_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,12 @@ fn weird_check() {
.build();

p.cargo("-- check --invalid_argument -some-other-argument")
.with_status(101)
.with_stderr(
"\
[WARNING] trailing arguments after built-in command `check` are ignored: `--invalid_argument -some-other-argument`
[CHECKING] foo v0.5.0 ([..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[ERROR] trailing arguments after built-in command `check` are unsupported: `--invalid_argument -some-other-argument`
To pass the arguments to the subcommand, remove `--`
",
)
.run();
Expand Down

0 comments on commit e320c3e

Please sign in to comment.