Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add unsupported lowercase -z flag suggestion for -Z flag #12788

Merged
merged 3 commits into from
Oct 10, 2023
Merged
Changes from 1 commit
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
9 changes: 1 addition & 8 deletions src/bin/cargo/cli.rs
Original file line number Diff line number Diff line change
@@ -619,14 +619,7 @@ See '<cyan,bold>cargo help</> <cyan><<command>></>' for more information on a sp
.global(true),
)
.arg_config()
.arg(
Arg::new("unstable-features")
.help("Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details")
.short('Z')
.value_name("FLAG")
.action(ArgAction::Append)
.global(true),
)
.arg_unstable_feature()
.subcommands(commands::builtin())
}

Rustin170506 marked this conversation as resolved.
Show resolved Hide resolved
22 changes: 22 additions & 0 deletions src/cargo/util/command_prelude.rs
Original file line number Diff line number Diff line change
@@ -393,6 +393,28 @@ pub trait CommandExt: Sized {
self._arg(unsupported_short_arg)
._arg(multi_opt("config", "KEY=VALUE", "Override a configuration value").global(true))
}

fn arg_unstable_feature(self) -> Self {
Rustin170506 marked this conversation as resolved.
Show resolved Hide resolved
let unsupported_short_arg = {
let value_parser = UnknownArgumentValueParser::suggest_arg("-Z");
Arg::new("unsupported-lowercase-unstable-feature-flag")
.help("")
.short('z')
.value_parser(value_parser)
.action(ArgAction::SetTrue)
.global(true)
.hide(true)
};
self._arg(
Arg::new("unstable-features")
.help("Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details")
.short('Z')
.value_name("FLAG")
.action(ArgAction::Append)
.global(true),
)
._arg(unsupported_short_arg)
}
}

impl CommandExt for Command {
2 changes: 2 additions & 0 deletions tests/testsuite/build.rs
Original file line number Diff line number Diff line change
@@ -259,6 +259,8 @@ fn cargo_compile_with_unsupported_short_unstable_feature_flag() {
"\
error: unexpected argument '-z' found

tip: a similar argument exists: '-Z'

Usage: cargo [+toolchain] [OPTIONS] [COMMAND]
Rustin170506 marked this conversation as resolved.
Show resolved Hide resolved
cargo [+toolchain] [OPTIONS] -Zscript <MANIFEST_RS> [ARGS]...