clippy

dantheman3333 · Oct 5, 2022 · bb96149 · bb96149
1 parent 9c251f2
commit bb96149
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 32 deletions.
diff --git a/src/from_os_str.rs b/src/from_os_str.rs
@@ -1,13 +1,15 @@
-use std::{ffi::OsString, path::PathBuf, str::FromStr};
+use std::{
+    any::{Any, TypeId},
+    ffi::OsString,
+    path::PathBuf,
+    str::FromStr,
+};
 
 pub(crate) fn parse_os_str<T>(os: OsString) -> Result<T, String>
 where
     T: FromStr + 'static,
     <T as std::str::FromStr>::Err: std::fmt::Display,
 {
-    use std::any::Any;
-    use std::any::*;
-
     if TypeId::of::<T>() == TypeId::of::<OsString>() {
         let anybox: Box<dyn Any> = Box::new(os);
         Ok(*(anybox.downcast::<T>().unwrap()))

diff --git a/src/params.rs b/src/params.rs
@@ -866,38 +866,35 @@ fn parse_word(
     metavar: &'static str,
     help: &Option<String>,
 ) -> Result<OsString, Error> {
-    match args.take_positional_word()? {
-        Some((is_strict, word)) => {
-            if strict && !is_strict {
-                #[cfg(feature = "autocomplete")]
-                args.push_value("--", &Some("-- Positional only items".to_owned()), false);
-
-                return Err(Error::Stderr(format!(
-                    "Expected <{}> to be on the right side of --",
-                    metavar,
-                )));
-            }
-            #[cfg(feature = "autocomplete")]
-            if args.touching_last_remove() && !args.no_pos_ahead {
-                args.push_metadata(metavar, help, false);
-                args.no_pos_ahead = true;
-            }
-            Ok(word)
-        }
-        None => {
+    if let Some((is_strict, word)) = args.take_positional_word()? {
+        if strict && !is_strict {
             #[cfg(feature = "autocomplete")]
-            if !args.no_pos_ahead {
-                args.push_metadata(metavar, help, false);
-                args.no_pos_ahead = true;
-            }
+            args.push_value("--", &Some("-- Positional only items".to_owned()), false);
 
-            let item = Item::Positional {
+            return Err(Error::Stderr(format!(
+                "Expected <{}> to be on the right side of --",
                 metavar,
-                help: help.clone(),
-                strict,
-            };
-            Err(Error::Missing(vec![item]))
+            )));
+        }
+        #[cfg(feature = "autocomplete")]
+        if args.touching_last_remove() && !args.no_pos_ahead {
+            args.push_metadata(metavar, help, false);
+            args.no_pos_ahead = true;
+        }
+        Ok(word)
+    } else {
+        #[cfg(feature = "autocomplete")]
+        if !args.no_pos_ahead {
+            args.push_metadata(metavar, help, false);
+            args.no_pos_ahead = true;
         }
+
+        let item = Item::Positional {
+            metavar,
+            help: help.clone(),
+            strict,
+        };
+        Err(Error::Missing(vec![item]))
     }
 }