Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-03-04 23:37:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor(help): Consolidate arg line usage generation

Browse source
This commit is contained in:
Ed Page 2023-11-09 12:14:25 -06:00
parent 83981a7f7b
commit 25e3a87d3c
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
clap_builder/src/output/usage.rs
View file

@ -103,7 +103,7 @@ impl<'cmd> Usage<'cmd> {
debug!("Usage::create_help_usage; incl_reqs={incl_reqs:?}"); debug!("Usage::create_help_usage; incl_reqs={incl_reqs:?}");
use std::fmt::Write as _; use std::fmt::Write as _;
self.write_arg_usage(styled, incl_reqs); self.write_arg_usage(styled, &[], incl_reqs);
// incl_reqs is only false when this function is called recursively // incl_reqs is only false when this function is called recursively
if (self.cmd.has_visible_subcommands() || self.cmd.is_allow_external_subcommands_set()) if (self.cmd.has_visible_subcommands() || self.cmd.is_allow_external_subcommands_set())
@ -161,18 +161,9 @@ impl<'cmd> Usage<'cmd> {
fn write_smart_usage(&self, styled: &mut StyledStr, used: &[Id]) { fn write_smart_usage(&self, styled: &mut StyledStr, used: &[Id]) {
debug!("Usage::create_smart_usage"); debug!("Usage::create_smart_usage");
use std::fmt::Write; use std::fmt::Write;
let literal = &self.styles.get_literal();
let placeholder = &self.styles.get_placeholder(); let placeholder = &self.styles.get_placeholder();
let bin_name = self.get_name(); self.write_arg_usage(styled, used, true);
let _ = write!(
styled,
"{}{bin_name}{} ",
literal.render(),
literal.render_reset()
);
self.write_args(styled, used, false);
if self.cmd.is_subcommand_required_set() { if self.cmd.is_subcommand_required_set() {
let value_name = self let value_name = self
@ -188,7 +179,7 @@ impl<'cmd> Usage<'cmd> {
} }
} }
fn write_arg_usage(&self, styled: &mut StyledStr, incl_reqs: bool) { fn write_arg_usage(&self, styled: &mut StyledStr, used: &[Id], incl_reqs: bool) {
debug!("Usage::write_arg_usage; incl_reqs={incl_reqs:?}"); debug!("Usage::write_arg_usage; incl_reqs={incl_reqs:?}");
use std::fmt::Write as _; use std::fmt::Write as _;
let literal = &self.styles.get_literal(); let literal = &self.styles.get_literal();
@ -205,7 +196,7 @@ impl<'cmd> Usage<'cmd> {
); );
} }
if self.needs_options_tag() { if used.is_empty() && self.needs_options_tag() {
let _ = write!( let _ = write!(
styled, styled,
"{}[OPTIONS]{} ", "{}[OPTIONS]{} ",
@ -214,7 +205,7 @@ impl<'cmd> Usage<'cmd> {
); );
} }
self.write_args(styled, &[], !incl_reqs); self.write_args(styled, used, !incl_reqs);
} }
fn get_name(&self) -> &str { fn get_name(&self) -> &str {