refactor(validator): Decouple parser

clap-rs · Apr 21, 2022 · 9d52301 · 9d52301
1 parent 6229e78
commit 9d52301
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 72 deletions.
diff --git a/src/parse/parser.rs b/src/parse/parser.rs
@@ -451,7 +451,7 @@ impl<'help, 'cmd> Parser<'help, 'cmd> {
                 #[cfg(feature = "env")]
                 self.add_env(matcher, trailing_values)?;
                 self.add_defaults(matcher, trailing_values);
-                return Validator::new(self).validate(parse_state, matcher);
+                return Validator::new(self.cmd).validate(parse_state, matcher);
             } else {
                 // Start error processing
                 return Err(self.match_arg_error(&arg_os, valid_arg_found, trailing_values));
@@ -471,7 +471,7 @@ impl<'help, 'cmd> Parser<'help, 'cmd> {
         #[cfg(feature = "env")]
         self.add_env(matcher, trailing_values)?;
         self.add_defaults(matcher, trailing_values);
-        Validator::new(self).validate(parse_state, matcher)
+        Validator::new(self.cmd).validate(parse_state, matcher)
     }
 
     fn match_arg_error(