Made violation logic take ExprCall instead of Expr

astral-sh · Jan 11, 2024 · ea5a54a · ea5a54a
1 parent 897d88f
commit ea5a54a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -864,7 +864,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 flake8_simplify::rules::dict_get_with_none_default(checker, expr);
             }
             if checker.enabled(Rule::ZipDictKeysAndValues) {
-                flake8_simplify::rules::zip_dict_keys_and_values(checker, expr);
+                flake8_simplify::rules::zip_dict_keys_and_values(checker, call);
             }
             if checker.any_enabled(&[
                 Rule::OsPathAbspath,

diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs
@@ -1,6 +1,6 @@
 use ast::{ExprAttribute, ExprName, Identifier};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, Arguments, Expr};
+use ruff_python_ast::{self as ast, Arguments, Expr, ExprCall};
 use ruff_text_size::Ranged;
 
 use crate::{checkers::ast::Checker, fix::snippet::SourceCodeSnippet};
@@ -59,15 +59,12 @@ impl AlwaysFixableViolation for ZipDictKeysAndValues {
 }
 
 /// SIM911
-pub(crate) fn zip_dict_keys_and_values(checker: &mut Checker, expr: &Expr) {
-    let Expr::Call(ast::ExprCall {
+pub(crate) fn zip_dict_keys_and_values(checker: &mut Checker, expr: &ExprCall) {
+    let ExprCall {
         func,
         arguments: Arguments { args, keywords, .. },
         ..
-    }) = expr
-    else {
-        return;
-    };
+    } = expr;
     match &keywords[..] {
         [] => {}
         [ast::Keyword {