Add ErrorKind::Internal for erroring

clap-rs · May 28, 2022 · f20e5f1 · f20e5f1
1 parent 4ab1491
commit f20e5f1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/clap_derive/src/derives/args.rs b/clap_derive/src/derives/args.rs
@@ -663,7 +663,8 @@ fn gen_parsers(
                             .map(|v| v.map::<::std::result::Result<#convert_type, clap::Error>, _>(#parse).collect::<::std::result::Result<Vec<_>, clap::Error>>())
                             .transpose()?
                             .unwrap_or_else(Vec::new)
-                    ).unwrap()
+                    )
+                    .map_err(|arr| clap::Error::raw(clap::ErrorKind::Internal, format!("Get value array with wrong length: {}", arr.len())))?
                 )
             } else {
                 None
@@ -686,7 +687,8 @@ fn gen_parsers(
                         .map(|v| v.map::<::std::result::Result<#convert_type, clap::Error>, _>(#parse).collect::<::std::result::Result<Vec<_>, clap::Error>>())
                         .transpose()?
                         .unwrap_or_else(Vec::new)
-                ).unwrap()
+                )
+                .map_err(|arr| clap::Error::raw(clap::ErrorKind::Internal, format!("Get value array with wrong length: {}", arr.len())))?
             }
         }
 

diff --git a/src/error/kind.rs b/src/error/kind.rs
@@ -393,6 +393,11 @@ pub enum ErrorKind {
     /// [`Display`]: std::fmt::Display
     /// [Format error]: std::fmt::Error
     Format,
+
+    /// Represents Clap's internal error.
+    ///
+    /// Please file a bug report at https://github.com/clap-rs/clap/issues.
+    Internal,
 }
 
 impl ErrorKind {
@@ -429,6 +434,7 @@ impl ErrorKind {
             Self::ArgumentNotFound => Some("An argument wasn't found"),
             Self::Io => None,
             Self::Format => None,
+            Self::Internal => Some(crate::INTERNAL_ERROR_MSG),
         }
     }
 }

diff --git a/src/error/mod.rs b/src/error/mod.rs
@@ -961,6 +961,7 @@ impl Error {
             ErrorKind::DisplayHelp
             | ErrorKind::DisplayHelpOnMissingArgumentOrSubcommand
             | ErrorKind::DisplayVersion
+            | ErrorKind::Internal
             | ErrorKind::Io
             | ErrorKind::Format => false,
         }