From 74b751ff2e3631e337b7946347c1119829a41c53 Mon Sep 17 00:00:00 2001 From: Kevin K Date: Sun, 12 Mar 2017 12:52:09 -0400 Subject: [PATCH] fix(ArgRequiredElseHelp): fixes the precedence of this error to prioritize over other error messages Closes #895 --- src/app/validator.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/validator.rs b/src/app/validator.rs index f874a8dcb77..ad4aa3dbc60 100644 --- a/src/app/validator.rs +++ b/src/app/validator.rs @@ -49,13 +49,6 @@ impl<'a, 'b, 'z> Validator<'a, 'b, 'z> { } } - try!(self.validate_blacklist(matcher)); - if !(self.0.is_set(AS::SubcommandsNegateReqs) && subcmd_name.is_some()) && !reqs_validated { - try!(self.validate_required(matcher)); - } - try!(self.validate_matched_args(matcher)); - matcher.usage(usage::create_usage_with_title(self.0, &[])); - if matcher.is_empty() && matcher.subcommand_name().is_none() && self.0.is_set(AS::ArgRequiredElseHelp) { let mut out = vec![]; @@ -66,6 +59,13 @@ impl<'a, 'b, 'z> Validator<'a, 'b, 'z> { info: None, }); } + try!(self.validate_blacklist(matcher)); + if !(self.0.is_set(AS::SubcommandsNegateReqs) && subcmd_name.is_some()) && !reqs_validated { + try!(self.validate_required(matcher)); + } + try!(self.validate_matched_args(matcher)); + matcher.usage(usage::create_usage_with_title(self.0, &[])); + Ok(()) }