diff --git a/clap_complete/tests/snapshots/aliases.bash b/clap_complete/tests/snapshots/aliases.bash index 730e2f4350c..a9949102be5 100644 --- a/clap_complete/tests/snapshots/aliases.bash +++ b/clap_complete/tests/snapshots/aliases.bash @@ -19,7 +19,7 @@ _my-app() { case "${cmd}" in my__app) - opts="-F -f -O -o -h -V --flg --flag --opt --option --help --version " + opts="-F -f -O -o -h -V --flg --flag --opt --option --help --version [positional]" if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 diff --git a/clap_complete/tests/snapshots/feature_sample.bash b/clap_complete/tests/snapshots/feature_sample.bash index 5bbb5762d06..2d1ec386ce4 100644 --- a/clap_complete/tests/snapshots/feature_sample.bash +++ b/clap_complete/tests/snapshots/feature_sample.bash @@ -25,7 +25,7 @@ _my-app() { case "${cmd}" in my__app) - opts="-C -c -h -V --conf --config --help --version first second test help" + opts="-C -c -h -V --conf --config --help --version [file] first second test help" if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 diff --git a/clap_complete/tests/snapshots/special_commands.bash b/clap_complete/tests/snapshots/special_commands.bash index 1fd80140a37..11f8c186c36 100644 --- a/clap_complete/tests/snapshots/special_commands.bash +++ b/clap_complete/tests/snapshots/special_commands.bash @@ -34,7 +34,7 @@ _my-app() { case "${cmd}" in my__app) - opts="-C -c -h -V --conf --config --help --version first second test some_cmd some-cmd-with-hyphens some-hidden-cmd help" + opts="-C -c -h -V --conf --config --help --version [file] first second test some_cmd some-cmd-with-hyphens some-hidden-cmd help" if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 @@ -160,7 +160,7 @@ _my-app() { return 0 ;; my__app__some_cmd) - opts="-h -V --config --help --version ..." + opts="-h -V --config --help --version [path]..." if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 diff --git a/clap_complete/tests/snapshots/sub_subcommands.bash b/clap_complete/tests/snapshots/sub_subcommands.bash index 1e05935e32c..31131382a2d 100644 --- a/clap_complete/tests/snapshots/sub_subcommands.bash +++ b/clap_complete/tests/snapshots/sub_subcommands.bash @@ -31,7 +31,7 @@ _my-app() { case "${cmd}" in my__app) - opts="-C -c -h -V --conf --config --help --version first second test some_cmd help" + opts="-C -c -h -V --conf --config --help --version [file] first second test some_cmd help" if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 diff --git a/clap_complete/tests/snapshots/value_hint.bash b/clap_complete/tests/snapshots/value_hint.bash index 1e109c6b977..2d3d88bae86 100644 --- a/clap_complete/tests/snapshots/value_hint.bash +++ b/clap_complete/tests/snapshots/value_hint.bash @@ -19,7 +19,7 @@ _my-app() { case "${cmd}" in my__app) - opts="-p -f -d -e -c -u -H -h --choice --unknown --other --path --file --dir --exe --cmd-name --cmd --user --host --url --email --help ..." + opts="-p -f -d -e -c -u -H -h --choice --unknown --other --path --file --dir --exe --cmd-name --cmd --user --host --url --email --help [command_with_args]..." if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 diff --git a/examples/escaped-positional-derive.md b/examples/escaped-positional-derive.md index a6605b2a9c2..9a0152725a3 100644 --- a/examples/escaped-positional-derive.md +++ b/examples/escaped-positional-derive.md @@ -12,7 +12,7 @@ Usage: escaped-positional-derive[EXE] [OPTIONS] [-- ...] Arguments: - ... + [SLOP]... Options: -f diff --git a/examples/escaped-positional.md b/examples/escaped-positional.md index ffc7ca3fea3..ce274e2d6a8 100644 --- a/examples/escaped-positional.md +++ b/examples/escaped-positional.md @@ -12,7 +12,7 @@ Usage: escaped-positional[EXE] [OPTIONS] [-- ...] Arguments: - ... + [SLOP]... Options: -f diff --git a/examples/git-derive.md b/examples/git-derive.md index bf8750837fa..f24fd1e94ae 100644 --- a/examples/git-derive.md +++ b/examples/git-derive.md @@ -111,7 +111,7 @@ Usage: git-derive[EXE] stash pop [STASH] Arguments: - + [STASH] Options: -h, --help Print help information diff --git a/examples/git.md b/examples/git.md index 95d58079592..5ae788d6c5e 100644 --- a/examples/git.md +++ b/examples/git.md @@ -109,7 +109,7 @@ Usage: git[EXE] stash pop [STASH] Arguments: - + [STASH] Options: -h, --help Print help information diff --git a/examples/pacman.md b/examples/pacman.md index 51642c6222f..002fc106cce 100644 --- a/examples/pacman.md +++ b/examples/pacman.md @@ -59,7 +59,7 @@ Usage: pacman[EXE] {sync|--sync|-S} [OPTIONS] [--] [package]... Arguments: - ... packages + [package]... packages Options: -s, --search ... search remote repositories for matching strings diff --git a/examples/tutorial_builder/01_quick.md b/examples/tutorial_builder/01_quick.md index c7f2d23f908..c595e83e975 100644 --- a/examples/tutorial_builder/01_quick.md +++ b/examples/tutorial_builder/01_quick.md @@ -11,7 +11,7 @@ Subcommands: help Print this message or the help of the given subcommand(s) Arguments: - Optional name to operate on + [name] Optional name to operate on Options: -c, --config Sets a custom config file diff --git a/examples/tutorial_builder/03_03_positional.md b/examples/tutorial_builder/03_03_positional.md index e5f543ad7cc..ef0301f0776 100644 --- a/examples/tutorial_builder/03_03_positional.md +++ b/examples/tutorial_builder/03_03_positional.md @@ -7,7 +7,7 @@ Usage: 03_03_positional[EXE] [name] Arguments: - + [name] Options: -h, --help Print help information diff --git a/examples/tutorial_builder/03_03_positional_mult.md b/examples/tutorial_builder/03_03_positional_mult.md index e030d3706fd..670e53e0652 100644 --- a/examples/tutorial_builder/03_03_positional_mult.md +++ b/examples/tutorial_builder/03_03_positional_mult.md @@ -7,7 +7,7 @@ Usage: 03_03_positional_mult[EXE] [name]... Arguments: - ... + [name]... Options: -h, --help Print help information diff --git a/examples/tutorial_builder/03_04_subcommands.md b/examples/tutorial_builder/03_04_subcommands.md index 0afa755fe77..cc2fc281c60 100644 --- a/examples/tutorial_builder/03_04_subcommands.md +++ b/examples/tutorial_builder/03_04_subcommands.md @@ -22,7 +22,7 @@ Usage: 03_04_subcommands[EXE] add [NAME] Arguments: - + [NAME] Options: -h, --help Print help information diff --git a/examples/tutorial_builder/03_05_default_values.md b/examples/tutorial_builder/03_05_default_values.md index 8ef13d80766..4415ca2d608 100644 --- a/examples/tutorial_builder/03_05_default_values.md +++ b/examples/tutorial_builder/03_05_default_values.md @@ -7,7 +7,7 @@ Usage: 03_05_default_values[EXE] [NAME] Arguments: - [default: alice] + [NAME] [default: alice] Options: -h, --help Print help information diff --git a/examples/tutorial_builder/04_03_relations.md b/examples/tutorial_builder/04_03_relations.md index a6978a20219..0ff757684ec 100644 --- a/examples/tutorial_builder/04_03_relations.md +++ b/examples/tutorial_builder/04_03_relations.md @@ -7,7 +7,7 @@ Usage: 04_03_relations[EXE] [OPTIONS] <--set-ver |--major|--minor|--patch> [INPUT_FILE] Arguments: - some regular input + [INPUT_FILE] some regular input Options: --set-ver set version manually diff --git a/examples/tutorial_builder/04_04_custom.md b/examples/tutorial_builder/04_04_custom.md index ff14837fedf..56ad9e584a7 100644 --- a/examples/tutorial_builder/04_04_custom.md +++ b/examples/tutorial_builder/04_04_custom.md @@ -7,7 +7,7 @@ Usage: 04_04_custom[EXE] [OPTIONS] [INPUT_FILE] Arguments: - some regular input + [INPUT_FILE] some regular input Options: --set-ver set version manually diff --git a/examples/tutorial_derive/01_quick.md b/examples/tutorial_derive/01_quick.md index 61e9bd3f160..e14f8b48196 100644 --- a/examples/tutorial_derive/01_quick.md +++ b/examples/tutorial_derive/01_quick.md @@ -11,7 +11,7 @@ Subcommands: help Print this message or the help of the given subcommand(s) Arguments: - Optional name to operate on + [NAME] Optional name to operate on Options: -c, --config Sets a custom config file diff --git a/examples/tutorial_derive/03_03_positional.md b/examples/tutorial_derive/03_03_positional.md index 9f2fcfd52c1..be0aee51388 100644 --- a/examples/tutorial_derive/03_03_positional.md +++ b/examples/tutorial_derive/03_03_positional.md @@ -7,7 +7,7 @@ Usage: 03_03_positional_derive[EXE] [NAME] Arguments: - + [NAME] Options: -h, --help Print help information diff --git a/examples/tutorial_derive/03_03_positional_mult.md b/examples/tutorial_derive/03_03_positional_mult.md index 3c45f474691..c6a3f2618bc 100644 --- a/examples/tutorial_derive/03_03_positional_mult.md +++ b/examples/tutorial_derive/03_03_positional_mult.md @@ -7,7 +7,7 @@ Usage: 03_03_positional_mult_derive[EXE] [NAME]... Arguments: - ... + [NAME]... Options: -h, --help Print help information diff --git a/examples/tutorial_derive/03_04_subcommands.md b/examples/tutorial_derive/03_04_subcommands.md index 87f56f8b9a2..8eb1a9806ad 100644 --- a/examples/tutorial_derive/03_04_subcommands.md +++ b/examples/tutorial_derive/03_04_subcommands.md @@ -22,7 +22,7 @@ Usage: 03_04_subcommands_derive[EXE] add [NAME] Arguments: - + [NAME] Options: -h, --help Print help information diff --git a/examples/tutorial_derive/03_05_default_values.md b/examples/tutorial_derive/03_05_default_values.md index d5c3c541e0a..6157875ebf5 100644 --- a/examples/tutorial_derive/03_05_default_values.md +++ b/examples/tutorial_derive/03_05_default_values.md @@ -7,7 +7,7 @@ Usage: 03_05_default_values_derive[EXE] [NAME] Arguments: - [default: alice] + [NAME] [default: alice] Options: -h, --help Print help information diff --git a/examples/tutorial_derive/04_03_relations.md b/examples/tutorial_derive/04_03_relations.md index 12f5978a3a2..dba580b5ebd 100644 --- a/examples/tutorial_derive/04_03_relations.md +++ b/examples/tutorial_derive/04_03_relations.md @@ -7,7 +7,7 @@ Usage: 04_03_relations_derive[EXE] [OPTIONS] <--set-ver |--major|--minor|--patch> [INPUT_FILE] Arguments: - some regular input + [INPUT_FILE] some regular input Options: --set-ver set version manually diff --git a/examples/tutorial_derive/04_04_custom.md b/examples/tutorial_derive/04_04_custom.md index 4a191d61ee6..3627f96547c 100644 --- a/examples/tutorial_derive/04_04_custom.md +++ b/examples/tutorial_derive/04_04_custom.md @@ -7,7 +7,7 @@ Usage: 04_04_custom_derive[EXE] [OPTIONS] [INPUT_FILE] Arguments: - some regular input + [INPUT_FILE] some regular input Options: --set-ver set version manually diff --git a/src/builder/arg.rs b/src/builder/arg.rs index 9f0d7db2f02..37f88046f2d 100644 --- a/src/builder/arg.rs +++ b/src/builder/arg.rs @@ -3970,7 +3970,7 @@ impl Arg { } } - pub(crate) fn stylized(&self) -> StyledStr { + pub(crate) fn stylized(&self, required: Option) -> StyledStr { let mut styled = StyledStr::new(); // Write the name such --long or -l if let Some(l) = self.get_long() { @@ -3980,11 +3980,11 @@ impl Arg { styled.literal("-"); styled.literal(s); } - styled.extend(self.stylize_arg_suffix().into_iter()); + styled.extend(self.stylize_arg_suffix(required).into_iter()); styled } - pub(crate) fn stylize_arg_suffix(&self) -> StyledStr { + pub(crate) fn stylize_arg_suffix(&self, required: Option) -> StyledStr { let mut styled = StyledStr::new(); let mut need_closing_bracket = false; @@ -4005,7 +4005,8 @@ impl Arg { } } if self.is_takes_value_set() || self.is_positional() { - let arg_val = self.render_arg_val(); + let required = required.unwrap_or_else(|| self.is_required_set()); + let arg_val = self.render_arg_val(required); styled.placeholder(arg_val); } else if matches!(*self.get_action(), ArgAction::Count) { styled.placeholder("..."); @@ -4018,7 +4019,7 @@ impl Arg { } /// Write the values such as - fn render_arg_val(&self) -> String { + fn render_arg_val(&self, required: bool) -> String { let mut rendered = String::new(); let num_vals = self.get_num_args().expect(INTERNAL_ERROR_MSG); @@ -4036,7 +4037,7 @@ impl Arg { debug_assert!(self.is_takes_value_set()); for (n, val_name) in val_names.iter().enumerate() { - let arg_name = if self.is_positional() && num_vals.min_values() == 0 { + let arg_name = if self.is_positional() && (num_vals.min_values() == 0 || !required) { format!("[{}]", val_name) } else { format!("<{}>", val_name) @@ -4098,7 +4099,7 @@ impl Eq for Arg {} impl Display for Arg { fn fmt(&self, f: &mut Formatter) -> fmt::Result { - self.stylized().fmt(f) + self.stylized(None).fmt(f) } } @@ -4372,6 +4373,14 @@ mod test { let mut p = Arg::new("pos").index(1).num_args(1..); p._build(); + assert_eq!(p.to_string(), "[pos]..."); + } + + #[test] + fn positional_display_multiple_values_required() { + let mut p = Arg::new("pos").index(1).num_args(1..).required(true); + p._build(); + assert_eq!(p.to_string(), "..."); } @@ -4388,6 +4397,14 @@ mod test { let mut p = Arg::new("pos").index(1).num_args(1..); p._build(); + assert_eq!(p.to_string(), "[pos]..."); + } + + #[test] + fn positional_display_one_or_more_values_required() { + let mut p = Arg::new("pos").index(1).num_args(1..).required(true); + p._build(); + assert_eq!(p.to_string(), "..."); } @@ -4407,6 +4424,17 @@ mod test { let mut p = Arg::new("pos").index(1).action(ArgAction::Append); p._build(); + assert_eq!(p.to_string(), "[pos]..."); + } + + #[test] + fn positional_display_multiple_occurrences_required() { + let mut p = Arg::new("pos") + .index(1) + .action(ArgAction::Append) + .required(true); + p._build(); + assert_eq!(p.to_string(), "..."); } @@ -4423,6 +4451,17 @@ mod test { let mut p = Arg::new("pos").index(1).value_names(["file1", "file2"]); p._build(); + assert_eq!(p.to_string(), "[file1] [file2]"); + } + + #[test] + fn positional_display_val_names_required() { + let mut p = Arg::new("pos") + .index(1) + .value_names(["file1", "file2"]) + .required(true); + p._build(); + assert_eq!(p.to_string(), " "); } diff --git a/src/output/help.rs b/src/output/help.rs index d0eae613596..51cc8d407ed 100644 --- a/src/output/help.rs +++ b/src/output/help.rs @@ -447,7 +447,7 @@ impl<'cmd, 'writer> Help<'cmd, 'writer> { self.none(TAB); self.short(arg); self.long(arg); - self.writer.extend(arg.stylize_arg_suffix().into_iter()); + self.writer.extend(arg.stylize_arg_suffix(None).into_iter()); self.align_to_about(arg, next_line_help, longest); let about = if self.use_long { diff --git a/src/output/usage.rs b/src/output/usage.rs index a3a944947ee..5edacce7964 100644 --- a/src/output/usage.rs +++ b/src/output/usage.rs @@ -418,10 +418,11 @@ impl<'cmd> Usage<'cmd> { if !is_present { if arg.is_positional() { if incl_last || !arg.is_last_set() { - required_positionals.insert((arg.index.unwrap(), arg.stylized())); + required_positionals + .insert((arg.index.unwrap(), arg.stylized(Some(true)))); } } else { - required_opts.insert(arg.stylized()); + required_opts.insert(arg.stylized(Some(true))); } } } else { @@ -445,7 +446,7 @@ impl<'cmd> Usage<'cmd> { group_members .iter() .flat_map(|id| self.cmd.find(id)) - .map(|arg| arg.stylized()), + .map(|arg| arg.stylized(Some(true))), ); } } diff --git a/tests/builder/app_settings.rs b/tests/builder/app_settings.rs index b8f46022a88..449e4000504 100644 --- a/tests/builder/app_settings.rs +++ b/tests/builder/app_settings.rs @@ -20,9 +20,9 @@ Usage: clap-test [arg1] [arg2] [arg3] Arguments: - some - some - some + [arg1] some + [arg2] some + [arg3] some Options: -h, --help Print help information @@ -292,7 +292,7 @@ Usage: test [OPTIONS] [arg1] Arguments: - some pos arg + [arg1] some pos arg Options: -o, --opt some option diff --git a/tests/builder/default_missing_vals.rs b/tests/builder/default_missing_vals.rs index b325af27939..cf67d85cda9 100644 --- a/tests/builder/default_missing_vals.rs +++ b/tests/builder/default_missing_vals.rs @@ -260,7 +260,7 @@ fn delimited_missing_value() { #[cfg(debug_assertions)] #[test] -#[should_panic = "Argument `arg`'s default_missing_value=\"value\" failed validation: error: \"value\" isn't a valid value for ''"] +#[should_panic = "Argument `arg`'s default_missing_value=\"value\" failed validation: error: \"value\" isn't a valid value for '[arg]'"] fn default_missing_values_are_possible_values() { use clap::{Arg, Command}; @@ -275,7 +275,7 @@ fn default_missing_values_are_possible_values() { #[cfg(debug_assertions)] #[test] -#[should_panic = "Argument `arg`'s default_missing_value=\"value\" failed validation: error: Invalid value \"value\" for '"] +#[should_panic = "Argument `arg`'s default_missing_value=\"value\" failed validation: error: Invalid value \"value\" for '[arg]"] fn default_missing_values_are_valid() { use clap::{Arg, Command}; diff --git a/tests/builder/default_vals.rs b/tests/builder/default_vals.rs index b327881adc2..6c32e614e94 100644 --- a/tests/builder/default_vals.rs +++ b/tests/builder/default_vals.rs @@ -794,7 +794,7 @@ fn required_args_with_default_values() { #[cfg(debug_assertions)] #[test] -#[should_panic = "Argument `arg`'s default_value=\"value\" failed validation: error: \"value\" isn't a valid value for ''"] +#[should_panic = "Argument `arg`'s default_value=\"value\" failed validation: error: \"value\" isn't a valid value for '[arg]'"] fn default_values_are_possible_values() { use clap::{Arg, Command}; @@ -809,7 +809,7 @@ fn default_values_are_possible_values() { #[cfg(debug_assertions)] #[test] -#[should_panic = "Argument `arg`'s default_value=\"one\" failed validation: error: Invalid value \"one\" for '"] +#[should_panic = "Argument `arg`'s default_value=\"one\" failed validation: error: Invalid value \"one\" for '[arg]"] fn invalid_default_values() { use clap::{Arg, Command}; @@ -838,7 +838,7 @@ fn valid_delimited_default_values() { #[cfg(debug_assertions)] #[test] -#[should_panic = "Argument `arg`'s default_value=\"one\" failed validation: error: Invalid value \"one\" for '"] +#[should_panic = "Argument `arg`'s default_value=\"one\" failed validation: error: Invalid value \"one\" for '[arg]"] fn invalid_delimited_default_values() { use clap::{Arg, Command}; diff --git a/tests/builder/groups.rs b/tests/builder/groups.rs index 5187ceb5736..c02641f3185 100644 --- a/tests/builder/groups.rs +++ b/tests/builder/groups.rs @@ -12,7 +12,7 @@ For more information try --help "; static REQ_GROUP_CONFLICT_USAGE: &str = - "error: The argument '--delete' cannot be used with '' + "error: The argument '--delete' cannot be used with '[base]' Usage: clap-test @@ -267,7 +267,7 @@ Usage: prog Arguments: - + [A] Options: -h, --help Print help information diff --git a/tests/builder/help.rs b/tests/builder/help.rs index ac68374da1f..8492aa6a750 100644 --- a/tests/builder/help.rs +++ b/tests/builder/help.rs @@ -123,8 +123,8 @@ Usage: flamegraph [OPTIONS] [BINFILE] [-- ...] Arguments: - The path of the binary to be profiled. for a binary. - ... Any arguments you wish to pass to the being profiled. + [BINFILE] The path of the binary to be profiled. for a binary. + [ARGS]... Any arguments you wish to pass to the being profiled. Options: -v, --verbose Prints out more stuff. @@ -212,9 +212,9 @@ Subcommands: help Print this message or the help of the given subcommand(s) Arguments: - tests positionals - tests positionals with exclusions - ... tests specific values [possible values: vi, emacs] + [positional] tests positionals + [positional2] tests positionals with exclusions + [positional3]... tests specific values [possible values: vi, emacs] Options: -o, --option ... tests options @@ -549,7 +549,7 @@ Usage: clap-test subcmd [OPTIONS] [--] [scpositional] Arguments: - tests positionals + [scpositional] tests positionals Options: -o, --option ... tests options @@ -801,7 +801,7 @@ Usage: ctest [mode] Arguments: - x, max, maximum 20 characters, contains + [mode] x, max, maximum 20 characters, contains symbols. l, long Copy-friendly, 14 characters, contains symbols. @@ -965,8 +965,8 @@ Usage: myapp [OPTIONS] [--] [ARGS] Arguments: - some option - ... some option + [arg1] some option + [arg2]... some option Options: -s, --some some option @@ -1024,7 +1024,7 @@ Usage: myapp [arg1] Arguments: - + [arg1] some option Options: @@ -1108,7 +1108,7 @@ Subcommands: help Print this message or the help of the given subcommand(s) Arguments: - help + [PATH] help Options: -o, --opt tests options @@ -1160,7 +1160,7 @@ Subcommands: help Print this message or the help of the given subcommand(s) Arguments: - help + [PATH] help Options: -f, --flag testing flags @@ -1187,7 +1187,7 @@ Usage: prog [OPTIONS] [PATH] Arguments: - some + [PATH] some Options: -f, --flag testing flags @@ -1337,8 +1337,8 @@ Usage: Arguments: some - some - ... some + [CORPUS] some + [ARGS]... some Options: -h, --help Print help information @@ -1368,7 +1368,7 @@ Usage: Arguments: some - some + [CORPUS] some ... some Options: @@ -1405,7 +1405,7 @@ Subcommands: Arguments: some - some + [CORPUS] some ... some Options: @@ -1444,8 +1444,8 @@ Subcommands: Arguments: some - some - ... some + [CORPUS] some + [ARGS]... some Options: -h, --help Print help information @@ -1851,7 +1851,7 @@ Usage: demo [OPTIONS] [FILES]... Arguments: - ... + [FILES]... Options: -f @@ -1885,8 +1885,8 @@ Usage: ctest Arguments: - - + [arg1] + [arg2] Options: -h, --help Print help information @@ -2274,8 +2274,8 @@ Usage: deno [pos2] Arguments: - - + [pos1] + [pos2] Options: --option1 @@ -2306,14 +2306,14 @@ Usage: test [ARGS] Arguments: - Which gear + [gear] Which gear Options: -h, --help Print help information -V, --version Print version information NETWORKING: - How fast + [speed] How fast "; #[test] @@ -2355,7 +2355,7 @@ Usage: test [speed] NETWORKING: - How fast + [speed] How fast "; #[test] @@ -2413,7 +2413,7 @@ Usage: test [arg1] Arguments: - + [arg1] Options: @@ -2439,9 +2439,9 @@ Usage: test [ARGS] Arguments: - - - ... + [foo] + [bar] + [baz]... Options: -h, --help Print help information diff --git a/tests/builder/hidden_args.rs b/tests/builder/hidden_args.rs index 106b15f1c66..836fc9ede8b 100644 --- a/tests/builder/hidden_args.rs +++ b/tests/builder/hidden_args.rs @@ -197,7 +197,7 @@ Usage: test [another] Arguments: - another pos + [another] another pos Options: -h, --help Print help information diff --git a/tests/builder/subcommands.rs b/tests/builder/subcommands.rs index 876d30be59a..afbcff64b88 100644 --- a/tests/builder/subcommands.rs +++ b/tests/builder/subcommands.rs @@ -580,7 +580,7 @@ Usage: foo bar [value] Arguments: - + [value] Options: -h, --help Print help information @@ -603,7 +603,7 @@ Usage: foo bar [value] Arguments: - + [value] Options: -h, --help Print help information @@ -626,7 +626,7 @@ Usage: foo bar [value] Arguments: - + [value] Options: -h, --help Print help information