Merge pull request #3696 from epage/usage

refactor(help): Remove more redundant required checks
clap-rs · May 6, 2022 · 0e1e952 · 0e1e952
2 parents dcda237 + 05aecf8
commit 0e1e952
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/parse/parser.rs b/src/parse/parser.rs
@@ -1468,11 +1468,7 @@ impl<'help, 'cmd> Parser<'help, 'cmd> {
         let required = self.cmd.required_graph();
         let used: Vec<Id> = matcher
             .arg_names()
-            .filter(|n| {
-                self.cmd
-                    .find(n)
-                    .map_or(true, |a| !(required.contains(&a.id) || a.is_hide_set()))
-            })
+            .filter(|n| self.cmd.find(n).map_or(true, |a| !a.is_hide_set()))
             .cloned()
             .collect();
 

diff --git a/src/parse/validator.rs b/src/parse/validator.rs
@@ -125,11 +125,7 @@ impl<'help, 'cmd> Validator<'help, 'cmd> {
                     let used: Vec<Id> = matcher
                         .arg_names()
                         .filter(|arg_id| matcher.check_explicit(arg_id, ArgPredicate::IsPresent))
-                        .filter(|&n| {
-                            self.cmd.find(n).map_or(true, |a| {
-                                !(a.is_hide_set() || self.required.contains(&a.id))
-                            })
-                        })
+                        .filter(|&n| self.cmd.find(n).map_or(true, |a| !a.is_hide_set()))
                         .cloned()
                         .collect();
                     return Err(Error::invalid_value(