From 05aecf82488bfeb13bd0a88070db45cc325b1cec Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 5 May 2022 20:33:16 -0500 Subject: [PATCH] refactor(help): Remove more redundant required checks Made redundant in #3689 but missed updating these. --- src/parse/parser.rs | 6 +----- src/parse/validator.rs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/parse/parser.rs b/src/parse/parser.rs index cb74532d490..5ca9cfe8d0d 100644 --- 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 = 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 index 4a29bb3694b..2e2766f6515 100644 --- a/src/parse/validator.rs +++ b/src/parse/validator.rs @@ -125,11 +125,7 @@ impl<'help, 'cmd> Validator<'help, 'cmd> { let used: Vec = 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(