Merge pull request #4923 from epage/update

chore: Update from '_rust/main' template

.clippy.toml

@@ -4,8 +4,10 @@ allow-expect-in-tests = true
 allow-unwrap-in-tests = true
 allow-dbg-in-tests = true
 disallowed-methods = [
-    { path = "std::option::Option::map_or", reason = "use `map(..).unwrap_or(..)`" },
-    { path = "std::option::Option::map_or_else", reason = "use `map(..).unwrap_or_else(..)`" },
-    { path = "std::result::Result::map_or", reason = "use `map(..).unwrap_or(..)`" },
-    { path = "std::result::Result::map_or_else", reason = "use `map(..).unwrap_or_else(..)`" },
+    { path = "std::option::Option::map_or", reason = "prefer `map(..).unwrap_or(..)` for legibility" },
+    { path = "std::option::Option::map_or_else", reason = "prefer `map(..).unwrap_or_else(..)` for legibility" },
+    { path = "std::result::Result::map_or", reason = "prefer `map(..).unwrap_or(..)` for legibility" },
+    { path = "std::result::Result::map_or_else", reason = "prefer `map(..).unwrap_or_else(..)` for legibility" },
+    { path = "std::iter::Iterator::for_each", reason = "prefer `for` for side-effects" },
+    { path = "std::iter::Iterator::try_for_each", reason = "prefer `for` for side-effects" },
 ]

clap_builder/src/parser/validator.rs

@@ -136,8 +136,9 @@ impl<'cmd> Validator<'cmd> {
                     // Find `arg`s which are exclusive but also appear with other args.
                     .filter(|&arg| arg.is_exclusive_set() && args_count > 1)
             })
-            // Throw an error for the first conflict found.
-            .try_for_each(|arg| {
+            .next()
+            .map(|arg| {
+                // Throw an error for the first conflict found.
                 Err(Error::argument_conflict(
                     self.cmd,
                     arg.to_string(),
@@ -147,6 +148,7 @@ impl<'cmd> Validator<'cmd> {
                         .create_usage_with_title(&[]),
                 ))
             })
+            .unwrap_or(Ok(()))
     }
 
     fn build_conflict_err(

tests/derive/skip.rs

@@ -70,17 +70,13 @@ fn skip_2() {
 fn skip_enum() {
     #[derive(Debug, PartialEq)]
     #[allow(unused)]
+    #[derive(Default)]
     enum Kind {
         A,
+        #[default]
         B,
     }
 
-    impl Default for Kind {
-        fn default() -> Self {
-            Kind::B
-        }
-    }
-
     #[derive(Parser, Debug, PartialEq)]
     pub struct Opt {
         #[arg(long, short)]