feat(parser): Allow querying whether actions take values

epage · Jun 6, 2022 · 4489f09 · 4489f09
1 parent 955f8b6
commit 4489f09
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/src/builder/action.rs b/src/builder/action.rs
@@ -276,6 +276,24 @@ pub enum ArgAction {
 }
 
 impl ArgAction {
+    /// Returns whether this action accepts values on the command-line
+    ///
+    /// [`default_values`][super::Arg::default_values] and [`env`][super::Arg::env] may still be
+    /// processed.
+    pub fn takes_values(&self) -> bool {
+        match self {
+            Self::Set => true,
+            Self::Append => true,
+            Self::StoreValue => true,
+            Self::IncOccurrence => false,
+            Self::SetTrue => false,
+            Self::SetFalse => false,
+            Self::Count => false,
+            Self::Help => false,
+            Self::Version => false,
+        }
+    }
+
     pub(crate) fn default_value(&self) -> Option<&'static std::ffi::OsStr> {
         match self {
             Self::Set => None,
@@ -290,20 +308,6 @@ impl ArgAction {
         }
     }
 
-    pub(crate) fn takes_value(&self) -> bool {
-        match self {
-            Self::Set => true,
-            Self::Append => true,
-            Self::StoreValue => true,
-            Self::IncOccurrence => false,
-            Self::SetTrue => false,
-            Self::SetFalse => false,
-            Self::Count => false,
-            Self::Help => false,
-            Self::Version => false,
-        }
-    }
-
     pub(crate) fn default_value_parser(&self) -> Option<super::ValueParser> {
         match self {
             Self::Set => None,

diff --git a/src/builder/arg.rs b/src/builder/arg.rs
@@ -4897,7 +4897,7 @@ impl<'help> Arg<'help> {
                     self.default_vals = vec![default_value];
                 }
             }
-            if action.takes_value() {
+            if action.takes_values() {
                 self.settings.set(ArgSettings::TakesValue);
             } else {
                 self.settings.unset(ArgSettings::TakesValue);

diff --git a/src/builder/debug_asserts.rs b/src/builder/debug_asserts.rs
@@ -643,7 +643,7 @@ fn assert_arg(arg: &Arg) {
     );
 
     assert_eq!(
-        arg.get_action().takes_value(),
+        arg.get_action().takes_values(),
         arg.is_takes_value_set(),
         "Argument `{}`'s selected action {:?} contradicts `takes_value`",
         arg.name,