refactor(parser): Centralize knowledge for explicit

clap-rs · Oct 12, 2022 · e98fc7f · e98fc7f
1 parent e704adb
commit e98fc7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/parser/matches/matched_arg.rs b/src/parser/matches/matched_arg.rs
@@ -130,7 +130,7 @@ impl MatchedArg {
     }
 
     pub(crate) fn check_explicit(&self, predicate: &ArgPredicate) -> bool {
-        if self.source == Some(ValueSource::DefaultValue) {
+        if self.source.map(|s| !s.is_explicit()).unwrap_or(false) {
             return false;
         }
 

diff --git a/src/parser/matches/value_source.rs b/src/parser/matches/value_source.rs
@@ -9,3 +9,9 @@ pub enum ValueSource {
     /// Value was passed in on the command-line
     CommandLine,
 }
+
+impl ValueSource {
+    pub(crate) fn is_explicit(self) -> bool {
+        self != Self::DefaultValue
+    }
+}