Merge pull request #4067 from epage/clippy

style: Address clippy

clap_complete/src/shells/bash.rs

@@ -126,9 +126,9 @@ fn subcommand_details(cmd: &Command) -> String {
             return 0
             ;;",
             subcmd = sc.replace('-', "__"),
-            sc_opts = all_options_for_path(cmd, &*sc),
+            sc_opts = all_options_for_path(cmd, sc),
             level = sc.split("__").map(|_| 1).sum::<u64>(),
-            opts_details = option_details_for_path(cmd, &*sc)
+            opts_details = option_details_for_path(cmd, sc)
         )
     }));
 

clap_complete/src/shells/zsh.rs

@@ -235,7 +235,7 @@ fn get_subcommands_of(parent: &Command) -> String {
         );
         let mut segments = vec![format!("({})", name)];
         let subcommand_args = get_args_of(
-            parser_of(parent, &*bin_name).expect(INTERNAL_ERROR_MSG),
+            parser_of(parent, bin_name).expect(INTERNAL_ERROR_MSG),
             Some(parent),
         );
 
@@ -244,7 +244,7 @@ fn get_subcommands_of(parent: &Command) -> String {
         }
 
         // Get the help text of all child subcommands.
-        let children = get_subcommands_of(parser_of(parent, &*bin_name).expect(INTERNAL_ERROR_MSG));
+        let children = get_subcommands_of(parser_of(parent, bin_name).expect(INTERNAL_ERROR_MSG));
 
         if !children.is_empty() {
             segments.push(children);

clap_derive/src/attrs.rs

@@ -1102,7 +1102,7 @@ fn process_author_str(author: &str) -> String {
 }
 
 /// Defines the casing for the attributes long representation.
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum CasingStyle {
     /// Indicate word boundaries with uppercase letter, excluding the first word.
     Camel,

clap_derive/src/utils/ty.rs

@@ -7,7 +7,7 @@ use syn::{
     PathSegment, Type, TypePath,
 };
 
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Ty {
     Vec,
     Option,

src/builder/arg.rs

@@ -112,7 +112,7 @@ impl<'help> Arg<'help> {
     #[must_use]
     pub fn id<S: Into<&'help str>>(mut self, n: S) -> Self {
         let name = n.into();
-        self.id = Id::from(&*name);
+        self.id = Id::from(name);
         self.name = name;
         self
     }
@@ -3976,10 +3976,10 @@ impl<'help> Arg<'help> {
                         .iter()
                         .map(|n| format!("<{}>", n))
                         .collect::<Vec<_>>()
-                        .join(&*delim),
+                        .join(delim),
                 )
             } else {
-                Cow::Borrowed(self.val_names.get(0).expect(INTERNAL_ERROR_MSG))
+                Cow::Borrowed(self.val_names.first().expect(INTERNAL_ERROR_MSG))
             }
         } else {
             debug!("Arg::name_no_brackets: just name");

src/builder/debug_asserts.rs

@@ -67,7 +67,7 @@ pub(crate) fn assert_app(cmd: &Command) {
         );
 
         if let Some(s) = arg.short.as_ref() {
-            short_flags.push(Flag::Arg(format!("-{}", s), &*arg.name));
+            short_flags.push(Flag::Arg(format!("-{}", s), arg.name));
         }
 
         for (short_alias, _) in &arg.short_aliases {
@@ -76,7 +76,7 @@ pub(crate) fn assert_app(cmd: &Command) {
 
         if let Some(l) = arg.long.as_ref() {
             assert!(!l.starts_with('-'), "Argument {}: long {:?} must not start with a `-`, that will be handled by the parser", arg.name, l);
-            long_flags.push(Flag::Arg(format!("--{}", l), &*arg.name));
+            long_flags.push(Flag::Arg(format!("--{}", l), arg.name));
         }
 
         for (long_alias, _) in &arg.aliases {

src/error/kind.rs

@@ -1,5 +1,5 @@
 /// Command line argument parser kind of error
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[non_exhaustive]
 pub enum ErrorKind {
     /// Occurs when an [`Arg`][crate::Arg] has a set of possible values,

src/output/usage.rs

@@ -38,7 +38,7 @@ impl<'help, 'cmd> Usage<'help, 'cmd> {
     pub(crate) fn create_usage_no_title(&self, used: &[Id]) -> String {
         debug!("Usage::create_usage_no_title");
         if let Some(u) = self.cmd.get_override_usage() {
-            String::from(&*u)
+            String::from(u)
         } else if used.is_empty() {
             self.create_help_usage(true)
         } else {
@@ -134,7 +134,7 @@ impl<'help, 'cmd> Usage<'help, 'cmd> {
                 if !self.cmd.is_args_conflicts_with_subcommands_set() {
                     usage.push_str(&*self.create_help_usage(false));
                 } else {
-                    usage.push_str(&*name);
+                    usage.push_str(name);
                 }
                 usage.push_str(" <");
                 usage.push_str(placeholder);

tests/builder/utf8.rs

@@ -109,7 +109,7 @@ fn invalid_utf8_positional() {
     let m = r.unwrap();
     assert!(m.contains_id("arg"));
     assert_eq!(
-        &*m.get_one::<OsString>("arg").unwrap(),
+        m.get_one::<OsString>("arg").unwrap(),
         &*OsString::from_vec(vec![0xe9])
     );
 }
@@ -133,7 +133,7 @@ fn invalid_utf8_option_short_space() {
     let m = r.unwrap();
     assert!(m.contains_id("arg"));
     assert_eq!(
-        &*m.get_one::<OsString>("arg").unwrap(),
+        m.get_one::<OsString>("arg").unwrap(),
         &*OsString::from_vec(vec![0xe9])
     );
 }
@@ -156,7 +156,7 @@ fn invalid_utf8_option_short_equals() {
     let m = r.unwrap();
     assert!(m.contains_id("arg"));
     assert_eq!(
-        &*m.get_one::<OsString>("arg").unwrap(),
+        m.get_one::<OsString>("arg").unwrap(),
         &*OsString::from_vec(vec![0xe9])
     );
 }
@@ -179,7 +179,7 @@ fn invalid_utf8_option_short_no_space() {
     let m = r.unwrap();
     assert!(m.contains_id("arg"));
     assert_eq!(
-        &*m.get_one::<OsString>("arg").unwrap(),
+        m.get_one::<OsString>("arg").unwrap(),
         &*OsString::from_vec(vec![0xe9])
     );
 }
@@ -203,7 +203,7 @@ fn invalid_utf8_option_long_space() {
     let m = r.unwrap();
     assert!(m.contains_id("arg"));
     assert_eq!(
-        &*m.get_one::<OsString>("arg").unwrap(),
+        m.get_one::<OsString>("arg").unwrap(),
         &*OsString::from_vec(vec![0xe9])
     );
 }
@@ -226,7 +226,7 @@ fn invalid_utf8_option_long_equals() {
     let m = r.unwrap();
     assert!(m.contains_id("arg"));
     assert_eq!(
-        &*m.get_one::<OsString>("arg").unwrap(),
+        m.get_one::<OsString>("arg").unwrap(),
         &*OsString::from_vec(vec![0xe9])
     );
 }

tests/derive/flags.rs

@@ -17,7 +17,7 @@ use clap::Parser;
 
 #[test]
 fn bool_type_is_flag() {
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         #[clap(short, long)]
         alice: bool,
@@ -46,7 +46,7 @@ fn bool_type_is_flag() {
 #[test]
 #[ignore] // Not a good path for supporting this atm
 fn inferred_help() {
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         /// Foo
         #[clap(short, long)]
@@ -63,7 +63,7 @@ fn inferred_help() {
 #[test]
 #[ignore] // Not a good path for supporting this atm
 fn inferred_version() {
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         /// Foo
         #[clap(short, long)]
@@ -82,7 +82,7 @@ fn inferred_version() {
 
 #[test]
 fn count() {
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         #[clap(short, long, action = clap::ArgAction::Count)]
         alice: u8,
@@ -116,7 +116,7 @@ fn count() {
 
 #[test]
 fn mixed_type_flags() {
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         #[clap(short, long)]
         alice: bool,
@@ -172,7 +172,7 @@ fn mixed_type_flags() {
 fn ignore_qualified_bool_type() {
     mod inner {
         #[allow(non_camel_case_types)]
-        #[derive(PartialEq, Debug, Clone)]
+        #[derive(PartialEq, Eq, Debug, Clone)]
         pub struct bool(pub String);
 
         impl std::str::FromStr for self::bool {
@@ -184,7 +184,7 @@ fn ignore_qualified_bool_type() {
         }
     }
 
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         arg: inner::bool,
     }
@@ -199,7 +199,7 @@ fn ignore_qualified_bool_type() {
 
 #[test]
 fn override_implicit_action() {
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         #[clap(long, action = clap::ArgAction::Set)]
         arg: bool,
@@ -218,7 +218,7 @@ fn override_implicit_action() {
 
 #[test]
 fn override_implicit_from_flag_positional() {
-    #[derive(Parser, PartialEq, Debug)]
+    #[derive(Parser, PartialEq, Eq, Debug)]
     struct Opt {
         #[clap(action = clap::ArgAction::Set)]
         arg: bool,

tests/derive/skip.rs

@@ -103,7 +103,7 @@ fn skip_enum() {
 
 #[test]
 fn skip_help_doc_comments() {
-    #[derive(Parser, Debug, PartialEq)]
+    #[derive(Parser, Debug, PartialEq, Eq)]
     pub struct Opt {
         #[clap(skip, help = "internal_stuff")]
         a: u32,
@@ -134,7 +134,7 @@ fn skip_help_doc_comments() {
 
 #[test]
 fn skip_val() {
-    #[derive(Parser, Debug, PartialEq)]
+    #[derive(Parser, Debug, PartialEq, Eq)]
     pub struct Opt {
         #[clap(long, short)]
         number: u32,