From 3fb8953ff4aea9fc6e831915a2dd70562b86778d Mon Sep 17 00:00:00 2001
From: Nilstrieb <nilstrieb@gmail.com>
Date: Sat, 2 Oct 2021 11:05:40 +0200
Subject: [PATCH] clippy lints

---
 src/parse.rs  | 20 +++++++++-----------
 src/schema.rs |  4 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/parse.rs b/src/parse.rs
index cc513b5..7a89165 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -17,9 +17,7 @@ impl CliArgs {
         let mut result = Self::default();
 
         while let Some(arg) = args.next() {
-            let arg = arg
-                .into_string()
-                .map_err(|os_str| CallError::InvalidUtf8(os_str))?;
+            let arg = arg.into_string().map_err(CallError::InvalidUtf8)?;
 
             if let Some(long) = arg.strip_prefix("--") {
                 parse_long(schema, &mut result, long, &mut args)?;
@@ -66,9 +64,9 @@ fn parse_shorts(
     if let Some(flag) = first_flag {
         let command = schema
             .short(flag)
-            .ok_or_else(|| CallError::ShortFlagNotFound(flag))?;
+            .ok_or(CallError::ShortFlagNotFound(flag))?;
 
-        parse_value(command.kind, results, &command.long, args)?;
+        parse_value(command.kind, results, command.long, args)?;
     } else {
         // '-' is a valid argument, like the `cat -`
         results.unnamed.push("-".to_string());
@@ -77,10 +75,10 @@ fn parse_shorts(
     for flag in all_shorts {
         let command = schema
             .short(flag)
-            .ok_or_else(|| CallError::ShortFlagNotFound(flag))?;
+            .ok_or(CallError::ShortFlagNotFound(flag))?;
 
         if let SchemaKind::Bool = command.kind {
-            results.insert(&command.long, Box::new(true));
+            results.insert(command.long, Box::new(true));
         } else {
             return Err(CallError::CombinedShortWithValue(command.long.to_string()));
         }
@@ -99,7 +97,7 @@ fn parse_long(
         .long(long)
         .ok_or_else(|| CallError::LongFlagNotFound(long.to_string()))?;
 
-    parse_value(command.kind, results, &command.long, args)
+    parse_value(command.kind, results, command.long, args)
 }
 
 fn parse_value(
@@ -114,7 +112,7 @@ fn parse_value(
                 .next()
                 .ok_or_else(|| CallError::ExpectedValue(long.to_string(), kind))?
                 .into_string()
-                .map_err(|os_str| CallError::InvalidUtf8(os_str))?;
+                .map_err(CallError::InvalidUtf8)?;
             results.insert(long, Box::new(string));
         }
         SchemaKind::INum => {
@@ -122,7 +120,7 @@ fn parse_value(
                 .next()
                 .ok_or_else(|| CallError::ExpectedValue(long.to_string(), kind))?
                 .into_string()
-                .map_err(|os_str| CallError::InvalidUtf8(os_str))?
+                .map_err(CallError::InvalidUtf8)?
                 .parse::<isize>()
                 .map_err(|_| CallError::INan(long.to_string()))?;
             results.insert(long, Box::new(integer))
@@ -132,7 +130,7 @@ fn parse_value(
                 .next()
                 .ok_or_else(|| CallError::ExpectedValue(long.to_string(), kind))?
                 .into_string()
-                .map_err(|os_str| CallError::InvalidUtf8(os_str))?
+                .map_err(CallError::InvalidUtf8)?
                 .parse::<usize>()
                 .map_err(|_| CallError::UNan(long.to_string()))?;
             results.insert(long, Box::new(integer))
diff --git a/src/schema.rs b/src/schema.rs
index 7fa0f08..830768a 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -48,7 +48,7 @@ impl Schema {
     }
 
     fn add_command(&mut self, long_name: &'static str, command: SchemaCommand) -> Result<()> {
-        if let Some(_) = self.longs.insert(long_name, command) {
+        if self.longs.insert(long_name, command).is_some() {
             Err(SchemaError::NameAlreadyExists(long_name.to_string()))
         } else {
             Ok(())
@@ -64,7 +64,7 @@ impl Schema {
     }
 
     fn add_short_command(&mut self, short_name: char, command: SchemaCommand) -> Result<()> {
-        if let Some(_) = self.shorts.insert(short_name, command) {
+        if self.shorts.insert(short_name, command).is_some() {
             Err(SchemaError::NameAlreadyExists(short_name.to_string()))
         } else {
             Ok(())