From 4280d113f7d76d7c35d9ee35510cdf56d2c2d46f Mon Sep 17 00:00:00 2001 From: Wei Lee Date: Fri, 24 Jan 2025 23:09:32 +0800 Subject: [PATCH] refactor(AIR302): rename removed_in_3 as airflow_3_removal_expr and removed_in_3_function_def as airflow_3_removal_function_def --- .../ruff_linter/src/checkers/ast/analyze/expression.rs | 10 +++++----- .../ruff_linter/src/checkers/ast/analyze/statement.rs | 2 +- .../src/rules/airflow/rules/removal_in_3.rs | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs index 425432c6aa..8601165cb7 100644 --- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs +++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs @@ -176,7 +176,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) { pyupgrade::rules::use_pep646_unpack(checker, subscript); } if checker.enabled(Rule::Airflow3Removal) { - airflow::rules::removed_expr_in_3(checker, expr); + airflow::rules::airflow_3_removal_expr(checker, expr); } pandas_vet::rules::subscript(checker, value, expr); } @@ -227,7 +227,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) { refurb::rules::regex_flag_alias(checker, expr); } if checker.enabled(Rule::Airflow3Removal) { - airflow::rules::removed_expr_in_3(checker, expr); + airflow::rules::airflow_3_removal_expr(checker, expr); } if checker.enabled(Rule::Airflow3MovedToProvider) { airflow::rules::moved_to_provider_in_3(checker, expr); @@ -311,7 +311,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) { } } if checker.enabled(Rule::Airflow3Removal) { - airflow::rules::removed_expr_in_3(checker, expr); + airflow::rules::airflow_3_removal_expr(checker, expr); } if checker.enabled(Rule::MixedCaseVariableInGlobalScope) { if matches!(checker.semantic.current_scope().kind, ScopeKind::Module) { @@ -449,7 +449,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) { flake8_pyi::rules::bytestring_attribute(checker, expr); } if checker.enabled(Rule::Airflow3Removal) { - airflow::rules::removed_expr_in_3(checker, expr); + airflow::rules::airflow_3_removal_expr(checker, expr); } } Expr::Call( @@ -1150,7 +1150,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) { ruff::rules::unnecessary_regular_expression(checker, call); } if checker.enabled(Rule::Airflow3Removal) { - airflow::rules::removed_expr_in_3(checker, expr); + airflow::rules::airflow_3_removal_expr(checker, expr); } if checker.enabled(Rule::UnnecessaryCastToInt) { ruff::rules::unnecessary_cast_to_int(checker, call); diff --git a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs index 56407b2f41..bc9a0cd297 100644 --- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs +++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs @@ -377,7 +377,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) { flake8_pytest_style::rules::parameter_with_default_argument(checker, function_def); } if checker.enabled(Rule::Airflow3Removal) { - airflow::rules::removed_function_def_in_3(checker, function_def); + airflow::rules::airflow_3_removal_function_def(checker, function_def); } if checker.enabled(Rule::NonPEP695GenericFunction) { pyupgrade::rules::non_pep695_generic_function(checker, function_def); diff --git a/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs b/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs index 9dfdcfc625..b12fc20eca 100644 --- a/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs +++ b/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs @@ -80,7 +80,7 @@ enum Replacement { } /// AIR302 -pub(crate) fn removed_expr_in_3(checker: &mut Checker, expr: &Expr) { +pub(crate) fn airflow_3_removal_expr(checker: &mut Checker, expr: &Expr) { if !checker.semantic().seen_module(Modules::AIRFLOW) { return; } @@ -117,7 +117,10 @@ pub(crate) fn removed_expr_in_3(checker: &mut Checker, expr: &Expr) { } /// AIR302 -pub(crate) fn removed_function_def_in_3(checker: &mut Checker, function_def: &StmtFunctionDef) { +pub(crate) fn airflow_3_removal_function_def( + checker: &mut Checker, + function_def: &StmtFunctionDef, +) { if !checker.semantic().seen_module(Modules::AIRFLOW) { return; }