clippy

astral-sh · Mar 3, 2024 · 90651a2 · 90651a2
1 parent 6b6b273
commit 90651a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs b/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
@@ -400,7 +400,7 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
                 Rule::InvalidFirstArgumentNameForClassMethod,
                 Rule::InvalidFirstArgumentNameForMethod,
             ]) {
-                pep8_naming::rules::invalid_first_argument_name(checker, scope, &mut diagnostics)
+                pep8_naming::rules::invalid_first_argument_name(checker, scope, &mut diagnostics);
             }
         }
     }

diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_first_argument_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_first_argument_name.rs
@@ -240,16 +240,16 @@ fn try_fix(
     function_type: ApplicableFunctionType,
 ) -> Option<Fix> {
     // Don't fix if another parameter has the valid name.
-    if let Some(_) = parameters
+    if parameters
         .posonlyargs
         .iter()
         .chain(&parameters.args)
         .chain(&parameters.kwonlyargs)
         .skip(1)
         .map(|parameter_with_default| &parameter_with_default.parameter)
-        .chain(parameters.vararg.as_deref().into_iter())
-        .chain(parameters.kwarg.as_deref().into_iter())
-        .find(|p| &p.name == function_type.valid_first_argument_name())
+        .chain(parameters.vararg.as_deref())
+        .chain(parameters.kwarg.as_deref())
+        .any(|p| &p.name == function_type.valid_first_argument_name())
     {
         return None;
     }