clippy::missing_asserts_for_indexing & use fail_incorrectusage_clier…

…ror macro in main for all binary variants
dathere · Nov 18, 2023 · 97d2e1d · 97d2e1d
1 parent b5fae59
commit 97d2e1d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -33,6 +33,9 @@
         clippy::use_self,
         clippy::cognitive_complexity,
         clippy::option_if_let_else,
+    ),
+    warn(
+        clippy::missing_asserts_for_indexing,
     )
 )]
 
@@ -386,11 +389,12 @@ impl Command {
         let argv: Vec<_> = argv.iter().map(|s| &**s).collect();
         let argv = &*argv;
 
+        assert!(argv.len() > 1);
         if !argv[1].chars().all(char::is_lowercase) {
-            return Err(CliError::Other(format!(
+            return fail_incorrectusage_clierror!(
                 "qsv expects commands in lowercase. Did you mean '{}'?",
                 argv[1].to_lowercase()
-            )));
+            );
         }
 
         CURRENT_COMMAND.get_or_init(|| argv[1].to_lowercase());

diff --git a/src/maindp.rs b/src/maindp.rs
@@ -267,11 +267,12 @@ impl Command {
         let argv: Vec<_> = argv.iter().map(|s| &**s).collect();
         let argv = &*argv;
 
+        assert!(argv.len() > 1);
         if !argv[1].chars().all(char::is_lowercase) {
-            return Err(CliError::Other(format!(
-                "qsvdp expects commands in lowercase. Did you mean '{}'?",
+            return fail_incorrectusage_clierror!(
+                "qsv expects commands in lowercase. Did you mean '{}'?",
                 argv[1].to_lowercase()
-            )));
+            );
         }
         CURRENT_COMMAND.get_or_init(|| argv[1].to_lowercase());
         match self {

diff --git a/src/mainlite.rs b/src/mainlite.rs
@@ -262,11 +262,12 @@ impl Command {
         let argv: Vec<_> = argv.iter().map(|s| &**s).collect();
         let argv = &*argv;
 
+        assert!(argv.len() > 1);
         if !argv[1].chars().all(char::is_lowercase) {
-            return Err(CliError::Other(format!(
-                "qsvlite expects commands in lowercase. Did you mean '{}'?",
+            return fail_incorrectusage_clierror!(
+                "qsv expects commands in lowercase. Did you mean '{}'?",
                 argv[1].to_lowercase()
-            )));
+            );
         }
         CURRENT_COMMAND.get_or_init(|| argv[1].to_lowercase());
         match self {