perf(help): Remove more from usage feature

Quality of error-context goes down with this.
clap-rs · Sep 19, 2022 · aecef54 · aecef54
1 parent b13ec5c
commit aecef54
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/src/output/usage.rs b/src/output/usage.rs
@@ -312,9 +312,7 @@ impl<'cmd> Usage<'cmd> {
         debug!("Usage::get_args: ret_val={:?}", ret_val);
         ret_val
     }
-}
 
-impl<'cmd> Usage<'cmd> {
     pub(crate) fn get_required_usage_from(
         &self,
         incls: &[Id],

diff --git a/src/parser/validator.rs b/src/parser/validator.rs
@@ -401,11 +401,32 @@ impl<'cmd> Validator<'cmd> {
 
         let usg = Usage::new(self.cmd).required(&self.required);
 
-        let req_args = usg
-            .get_required_usage_from(&raw_req_args, Some(matcher), true)
-            .into_iter()
-            .map(|s| s.to_string())
-            .collect::<Vec<_>>();
+        let req_args = {
+            #[cfg(feature = "usage")]
+            {
+                usg.get_required_usage_from(&raw_req_args, Some(matcher), true)
+                    .into_iter()
+                    .map(|s| s.to_string())
+                    .collect::<Vec<_>>()
+            }
+
+            #[cfg(not(feature = "usage"))]
+            {
+                raw_req_args
+                    .iter()
+                    .map(|id| {
+                        if let Some(arg) = self.cmd.find(id) {
+                            arg.to_string()
+                        } else if let Some(_group) = self.cmd.find_group(id) {
+                            self.cmd.format_group(id).to_string()
+                        } else {
+                            debug_assert!(false, "id={:?} is unknown", id);
+                            "".to_owned()
+                        }
+                    })
+                    .collect::<Vec<_>>()
+            }
+        };
 
         debug!(
             "Validator::missing_required_error: req_args={:#?}",