Skip to content

Commit

Permalink
fix: ArgRequiredElseHelp setting now takes precedence over missing re…
Browse files Browse the repository at this point in the history
…quired args

Closes #362
  • Loading branch information
kbknapp committed Dec 18, 2015
1 parent 2787227 commit faad83f
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2728,12 +2728,17 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar> {
if let Some(a) = self.positionals.values().filter(|p| &p.name == name).next() {
if self._validate_blacklist_required(a, matcher) { continue 'outer; }
}
return Err(error_builder::MissingRequiredArgument(
let err = if self.settings.is_set(&AppSettings::ArgRequiredElseHelp) && matcher.is_empty() {
self._help().unwrap_err()
} else {
error_builder::MissingRequiredArgument(
&*self.get_required_from(&self.required, Some(matcher))
.iter()
.fold(String::new(),
|acc, s| acc + &format!("\n\t{}", Format::Error(s))[..]),
&*try!(self.create_current_usage(matcher))));
&*try!(self.create_current_usage(matcher)))
};
return Err(err);
}
Ok(())
}
Expand Down

0 comments on commit faad83f

Please sign in to comment.