Merge pull request #5172 from epage/style

style: Make clippy happy
clap-rs · Oct 12, 2023 · deebc1f · deebc1f
2 parents 5ab2bab + dfebb54
commit deebc1f
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 23 deletions.
diff --git a/clap_builder/src/builder/command.rs b/clap_builder/src/builder/command.rs
@@ -746,7 +746,7 @@ impl Command {
         I: IntoIterator<Item = T>,
         T: Into<OsString> + Clone,
     {
-        let mut raw_args = clap_lex::RawArgs::new(itr.into_iter());
+        let mut raw_args = clap_lex::RawArgs::new(itr);
         let mut cursor = raw_args.cursor();
 
         if self.settings.is_set(AppSettings::Multicall) {

diff --git a/clap_builder/src/builder/debug_asserts.rs b/clap_builder/src/builder/debug_asserts.rs
@@ -405,6 +405,12 @@ impl PartialEq for Flag<'_> {
 
 impl PartialOrd for Flag<'_> {
     fn partial_cmp(&self, other: &Flag) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Flag<'_> {
+    fn cmp(&self, other: &Self) -> Ordering {
         use Flag::*;
 
         match (self, other) {
@@ -413,21 +419,15 @@ impl PartialOrd for Flag<'_> {
             | (Command(s1, _), Arg(s2, _))
             | (Arg(s1, _), Command(s2, _)) => {
                 if s1 == s2 {
-                    Some(Ordering::Equal)
+                    Ordering::Equal
                 } else {
-                    s1.partial_cmp(s2)
+                    s1.cmp(s2)
                 }
             }
         }
     }
 }
 
-impl Ord for Flag<'_> {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.partial_cmp(other).unwrap()
-    }
-}
-
 fn detect_duplicate_flags(flags: &[Flag], short_or_long: &str) {
     use Flag::*;
 

diff --git a/clap_builder/src/builder/os_str.rs b/clap_builder/src/builder/os_str.rs
@@ -316,7 +316,7 @@ impl PartialEq for Inner {
 
 impl PartialOrd for Inner {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.as_os_str().partial_cmp(other.as_os_str())
+        Some(self.cmp(other))
     }
 }
 

diff --git a/clap_builder/src/builder/str.rs b/clap_builder/src/builder/str.rs
@@ -290,7 +290,7 @@ impl PartialEq for Inner {
 
 impl PartialOrd for Inner {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.as_str().partial_cmp(other.as_str())
+        Some(self.cmp(other))
     }
 }
 

diff --git a/clap_builder/src/util/any_value.rs b/clap_builder/src/util/any_value.rs
@@ -65,7 +65,7 @@ impl Eq for AnyValueId {}
 
 impl PartialOrd for AnyValueId {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.type_id.partial_cmp(&other.type_id)
+        Some(self.cmp(other))
     }
 }
 

diff --git a/clap_complete/src/dynamic/completer.rs b/clap_complete/src/dynamic/completer.rs
@@ -35,7 +35,7 @@ pub fn complete(
 ) -> Result<Vec<(std::ffi::OsString, Option<StyledStr>)>, std::io::Error> {
     cmd.build();
 
-    let raw_args = clap_lex::RawArgs::new(args.into_iter());
+    let raw_args = clap_lex::RawArgs::new(args);
     let mut cursor = raw_args.cursor();
     let mut target_cursor = raw_args.cursor();
     raw_args.seek(

diff --git a/clap_derive/src/derives/args.rs b/clap_derive/src/derives/args.rs
@@ -104,6 +104,7 @@ pub fn gen_for_struct(
             clippy::cargo,
             clippy::suspicious_else_formatting,
             clippy::almost_swapped,
+            clippy::redundant_locals,
         )]
         #[automatically_derived]
         impl #impl_generics clap::FromArgMatches for #item_name #ty_generics #where_clause {
@@ -146,6 +147,7 @@ pub fn gen_for_struct(
             clippy::cargo,
             clippy::suspicious_else_formatting,
             clippy::almost_swapped,
+            clippy::redundant_locals,
         )]
         #[automatically_derived]
         impl #impl_generics clap::Args for #item_name #ty_generics #where_clause {

diff --git a/clap_derive/src/derives/into_app.rs b/clap_derive/src/derives/into_app.rs
@@ -47,6 +47,7 @@ pub fn gen_for_struct(
             clippy::cargo,
             clippy::suspicious_else_formatting,
             clippy::almost_swapped,
+            clippy::redundant_locals,
         )]
         #[automatically_derived]
         impl #impl_generics clap::CommandFactory for #item_name #ty_generics #where_clause {
@@ -94,6 +95,7 @@ pub fn gen_for_enum(
             clippy::cargo,
             clippy::suspicious_else_formatting,
             clippy::almost_swapped,
+            clippy::redundant_locals,
         )]
         #[automatically_derived]
         impl #impl_generics clap::CommandFactory for #item_name #ty_generics #where_clause {

diff --git a/clap_derive/src/derives/parser.rs b/clap_derive/src/derives/parser.rs
@@ -89,6 +89,7 @@ fn gen_for_struct(
         #[automatically_derived]
         #[allow(
             unused_qualifications,
+            clippy::redundant_locals,
         )]
         impl #impl_generics clap::Parser for #item_name #ty_generics #where_clause {}
 

diff --git a/clap_derive/src/derives/subcommand.rs b/clap_derive/src/derives/subcommand.rs
@@ -84,6 +84,7 @@ pub fn gen_for_enum(
             clippy::cargo,
             clippy::suspicious_else_formatting,
             clippy::almost_swapped,
+            clippy::redundant_locals,
         )]
         #[automatically_derived]
         impl #impl_generics clap::FromArgMatches for #item_name #ty_generics #where_clause {
@@ -117,6 +118,7 @@ pub fn gen_for_enum(
             clippy::cargo,
             clippy::suspicious_else_formatting,
             clippy::almost_swapped,
+            clippy::redundant_locals,
         )]
         #[automatically_derived]
         impl #impl_generics clap::Subcommand for #item_name #ty_generics #where_clause {

diff --git a/clap_derive/src/derives/value_enum.rs b/clap_derive/src/derives/value_enum.rs
@@ -69,6 +69,7 @@ pub fn gen_for_enum(
             clippy::cargo,
             clippy::suspicious_else_formatting,
             clippy::almost_swapped,
+            clippy::redundant_locals,
         )]
         #[automatically_derived]
         impl clap::ValueEnum for #item_name {

diff --git a/tests/builder/multiple_occurrences.rs b/tests/builder/multiple_occurrences.rs
@@ -71,18 +71,12 @@ fn multiple_occurrences_of_flags_large_quantity() {
     let cmd = Command::new("mo_flags_large_qty")
         .arg(arg!(-m --multflag "allowed multiple flag").action(ArgAction::Count));
 
-    let args: Vec<&str> = vec![""]
-        .into_iter()
-        .chain(vec!["-m"; 200].into_iter())
-        .collect();
+    let args: Vec<&str> = vec![""].into_iter().chain(vec!["-m"; 200]).collect();
     let m = cmd.clone().try_get_matches_from(args).unwrap();
     assert!(m.contains_id("multflag"));
     assert_eq!(m.get_one::<u8>("multflag").copied(), Some(200));
 
-    let args: Vec<&str> = vec![""]
-        .into_iter()
-        .chain(vec!["-m"; 500].into_iter())
-        .collect();
+    let args: Vec<&str> = vec![""].into_iter().chain(vec!["-m"; 500]).collect();
     let m = cmd.try_get_matches_from(args).unwrap();
     assert!(m.contains_id("multflag"));
     assert_eq!(m.get_one::<u8>("multflag").copied(), Some(u8::MAX));

diff --git a/tests/derive/doc_comments_help.rs b/tests/derive/doc_comments_help.rs
@@ -153,7 +153,7 @@ fn verbatim_doc_comment() {
     }
 
     let help = utils::get_long_help::<SeeFigure1>();
-    let sample = r#"
+    let sample = r"
                    ()
                    |
               (   ()   )
@@ -168,7 +168,7 @@ fn verbatim_doc_comment() {
       ((     ||
        \\    ||
      ( ()    ||
-      (      () ) )"#;
+      (      () ) )";
 
     assert!(help.contains(sample))
 }