Skip to content

Commit

Permalink
imp(Default Values): improves the error message when default values a…
Browse files Browse the repository at this point in the history
…re involved

Closes #774
  • Loading branch information
kbknapp committed Jan 2, 2017
1 parent 9c3cb98 commit 1f33de5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/app/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ impl<'a, 'b> Parser<'a, 'b>
reqs: &[&'a str],
matcher: Option<&ArgMatcher<'a>>)
-> VecDeque<String> {
debugln!("Parser::get_required_from;");
debugln!("Parser::get_required_from; reqs={:?}", reqs);
let mut c_flags: Vec<&str> = vec![];
let mut c_pos: Vec<&str> = vec![];
let mut c_opt: Vec<&str> = vec![];
Expand Down Expand Up @@ -994,15 +994,15 @@ impl<'a, 'b> Parser<'a, 'b>
}
}

try!(self.add_defaults(matcher));
try!(self.validate_blacklist(matcher));
try!(self.validate_matched_args(matcher));
matcher.usage(self.create_usage(&[]));

if !(self.settings.is_set(AppSettings::SubcommandsNegateReqs) && subcmd_name.is_some()) &&
!reqs_validated {
try!(self.validate_required(matcher));
}
try!(self.add_defaults(matcher));
try!(self.validate_matched_args(matcher));
matcher.usage(self.create_usage(&[]));

if matcher.is_empty() && matcher.subcommand_name().is_none() &&
self.is_set(AppSettings::ArgRequiredElseHelp) {
let mut out = vec![];
Expand Down

0 comments on commit 1f33de5

Please sign in to comment.