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): Pull out bin name logic

Browse source
This commit is contained in:
Ed Page 2023-11-09 12:03:35 -06:00
parent 7472aba6ce
commit 0c668c3915
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,16 +105,12 @@ impl<'cmd> Usage<'cmd> {
let literal = &self.styles.get_literal(); let literal = &self.styles.get_literal();
let placeholder = &self.styles.get_placeholder(); let placeholder = &self.styles.get_placeholder();
let name = self let bin_name = self.get_name();
.cmd if !bin_name.is_empty() {
.get_usage_name()
.or_else(|| self.cmd.get_bin_name())
.unwrap_or_else(|| self.cmd.get_name());
if !name.is_empty() {
// the trim won't properly remove a leading space due to the formatting // the trim won't properly remove a leading space due to the formatting
let _ = write!( let _ = write!(
styled, styled,
"{}{name}{} ", "{}{bin_name}{} ",
literal.render(), literal.render(),
literal.render_reset() literal.render_reset()
); );
@ -148,7 +144,7 @@ impl<'cmd> Usage<'cmd> {
// Short-circuit full usage creation since no args will be relevant // Short-circuit full usage creation since no args will be relevant
let _ = write!( let _ = write!(
styled, styled,
"{}{name}{} ", "{}{bin_name}{} ",
literal.render(), literal.render(),
literal.render_reset() literal.render_reset()
); );
@ -187,11 +183,7 @@ impl<'cmd> Usage<'cmd> {
let literal = &self.styles.get_literal(); let literal = &self.styles.get_literal();
let placeholder = &self.styles.get_placeholder(); let placeholder = &self.styles.get_placeholder();
let bin_name = self let bin_name = self.get_name();
.cmd
.get_usage_name()
.or_else(|| self.cmd.get_bin_name())
.unwrap_or_else(|| self.cmd.get_name());
let _ = write!( let _ = write!(
styled, styled,
"{}{bin_name}{} ", "{}{bin_name}{} ",
@ -215,6 +207,13 @@ impl<'cmd> Usage<'cmd> {
} }
} }
fn get_name(&self) -> &str {
self.cmd
.get_usage_name()
.or_else(|| self.cmd.get_bin_name())
.unwrap_or_else(|| self.cmd.get_name())
}
// Determines if we need the `[OPTIONS]` tag in the usage string // Determines if we need the `[OPTIONS]` tag in the usage string
fn needs_options_tag(&self) -> bool { fn needs_options_tag(&self) -> bool {
debug!("Usage::needs_options_tag"); debug!("Usage::needs_options_tag");