Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 06:42:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(Usage Strings): fixes small bug where -- would appear needlessly in usage strings

Browse source 
Closes #461
This commit is contained in:
Kevin K 2016-03-27 12:56:06 -04:00
parent 96869dfd57
commit 6933b8491c
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/app/parser.rs
View file

@ -341,19 +341,19 @@ impl<'a, 'b> Parser<'a, 'b> where 'a: 'b {
} }
pub fn has_flags(&self) -> bool { pub fn has_flags(&self) -> bool {
self.flags.is_empty() !self.flags.is_empty()
} }
pub fn has_opts(&self) -> bool { pub fn has_opts(&self) -> bool {
self.opts.is_empty() !self.opts.is_empty()
} }
pub fn has_positionals(&self) -> bool { pub fn has_positionals(&self) -> bool {
self.positionals.is_empty() !self.positionals.is_empty()
} }
pub fn has_subcommands(&self) -> bool { pub fn has_subcommands(&self) -> bool {
self.subcommands.is_empty() !self.subcommands.is_empty()
} }
pub fn is_set(&self, s: AppSettings) -> bool { pub fn is_set(&self, s: AppSettings) -> bool {
@ -1318,13 +1318,14 @@ impl<'a, 'b> Parser<'a, 'b> where 'a: 'b {
.iter() .iter()
.fold(String::new(), |a, s| a + &format!(" {}", s)[..]); .fold(String::new(), |a, s| a + &format!(" {}", s)[..]);
if !self.has_flags() && !self.is_set(AppSettings::UnifiedHelpMessage) { if self.has_flags() && !self.is_set(AppSettings::UnifiedHelpMessage) {
usage.push_str(" [FLAGS]"); usage.push_str(" [FLAGS]");
} else { } else {
usage.push_str(" [OPTIONS]"); usage.push_str(" [OPTIONS]");
} }
if !self.is_set(AppSettings::UnifiedHelpMessage) && !self.has_opts() && if !self.is_set(AppSettings::UnifiedHelpMessage)
self.opts.iter().any(|a| !a.settings.is_set(ArgSettings::Required)) { && self.has_opts()
&& self.opts.iter().any(|a| !a.settings.is_set(ArgSettings::Required)) {
usage.push_str(" [OPTIONS]"); usage.push_str(" [OPTIONS]");
} }
@ -1332,22 +1333,22 @@ impl<'a, 'b> Parser<'a, 'b> where 'a: 'b {
// places a '--' in the usage string if there are args and options // places a '--' in the usage string if there are args and options
// supporting multiple values // supporting multiple values
if !self.has_positionals() if self.has_positionals()
&& (self.opts.iter().any(|a| a.settings.is_set(ArgSettings::Multiple)) && self.opts.iter().any(|a| a.settings.is_set(ArgSettings::Multiple))
|| self.positionals.values().any(|a| a.settings.is_set(ArgSettings::Multiple))) // || self.positionals.values().any(|a| a.settings.is_set(ArgSettings::Multiple)))
&& !self.opts.iter().any(|a| a.settings.is_set(ArgSettings::Required)) && self.positionals.values().any(|a| !a.settings.is_set(ArgSettings::Required))
&& self.has_subcommands() { && !self.has_subcommands() {
usage.push_str(" [--]") usage.push_str(" [--]")
} }
if !self.has_positionals() if self.has_positionals()
&& self.positionals.values().any(|a| !a.settings.is_set(ArgSettings::Required)) { && self.positionals.values().any(|a| !a.settings.is_set(ArgSettings::Required)) {
usage.push_str(" [ARGS]"); usage.push_str(" [ARGS]");
} }
if !self.has_subcommands() && !self.is_set(AppSettings::SubcommandRequired) { if self.has_subcommands() && !self.is_set(AppSettings::SubcommandRequired) {
usage.push_str(" [SUBCOMMAND]"); usage.push_str(" [SUBCOMMAND]");
} else if self.is_set(AppSettings::SubcommandRequired) && !self.has_subcommands() { } else if self.is_set(AppSettings::SubcommandRequired) && self.has_subcommands() {
usage.push_str(" <SUBCOMMAND>"); usage.push_str(" <SUBCOMMAND>");
} }
} else { } else {
@ -1417,10 +1418,10 @@ impl<'a, 'b> Parser<'a, 'b> where 'a: 'b {
try!(write!(w, "\n{}", self.create_usage(&[]))); try!(write!(w, "\n{}", self.create_usage(&[])));
let flags = !self.has_flags(); let flags = self.has_flags();
let pos = !self.has_positionals(); let pos = self.has_positionals();
let opts = !self.has_opts(); let opts = self.has_opts();
let subcmds = !self.has_subcommands(); let subcmds = self.has_subcommands();
let unified_help = self.is_set(AppSettings::UnifiedHelpMessage); let unified_help = self.is_set(AppSettings::UnifiedHelpMessage);
let mut longest_flag = 0; let mut longest_flag = 0;