refactor(AIR301): combine similar cases in message and fix

Author: Lee-W

crates/ruff_linter/src/rules/airflow/helpers.rs

@@ -10,12 +10,12 @@ pub(crate) enum Replacement {
     Name(&'static str),
     Message(&'static str),
     AutoImport {
-        path: &'static str,
+        module: &'static str,
         name: &'static str,
     },
     SourceModuleMoved {
-        name: String,
         module: &'static str,
+        name: String,
     },
 }
 
@@ -59,10 +59,10 @@ pub(crate) fn is_guarded_by_try_except(
 /// contain any [`ast::StmtImportFrom`] nodes that indicate the numpy
 /// member is being imported from the non-deprecated location?
 fn try_block_contains_undeprecated_import(try_node: &StmtTry, replacement: &Replacement) -> bool {
-    let Replacement::AutoImport { path, name } = replacement else {
+    let Replacement::AutoImport { module, name } = replacement else {
         return false;
     };
-    let mut import_searcher = ImportSearcher::new(path, name);
+    let mut import_searcher = ImportSearcher::new(module, name);
     import_searcher.visit_body(&try_node.body);
     import_searcher.found_import
 }

crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs

@@ -54,28 +54,26 @@ impl Violation for Airflow3Removal {
             replacement,
         } = self;
         match replacement {
-            Replacement::None => format!("`{deprecated}` is removed in Airflow 3.0"),
-            Replacement::Name(_) => {
+            Replacement::None
+            | Replacement::Name(_)
+            | Replacement::AutoImport { module: _, name: _ }
+            | Replacement::SourceModuleMoved { module: _, name: _ } => {
                 format!("`{deprecated}` is removed in Airflow 3.0")
             }
             Replacement::Message(message) => {
                 format!("`{deprecated}` is removed in Airflow 3.0; {message}")
             }
-            Replacement::AutoImport { path: _, name: _ } => {
-                format!("`{deprecated}` is removed in Airflow 3.0")
-            }
-            Replacement::SourceModuleMoved { name: _, module: _ } => {
-                format!("`{deprecated}` is removed in Airflow 3.0")
-            }
         }
     }
 
     fn fix_title(&self) -> Option<String> {
         let Airflow3Removal { replacement, .. } = self;
         match replacement {
             Replacement::Name(name) => Some(format!("Use `{name}` instead")),
-            Replacement::AutoImport { path, name } => Some(format!("Use `{path}.{name}` instead")),
-            Replacement::SourceModuleMoved { name, module } => {
+            Replacement::AutoImport { module, name } => {
+                Some(format!("Use `{module}.{name}` instead"))
+            }
+            Replacement::SourceModuleMoved { module, name } => {
                 Some(format!("Use `{module}.{name}` instead"))
             }
             _ => None,
@@ -581,7 +579,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         }
         ["airflow", "api_connexion", "security", "requires_access_dataset"] => {
             Replacement::AutoImport {
-                path: "airflow.api_connexion.security",
+                module: "airflow.api_connexion.security",
                 name: "requires_access_asset",
             }
         }
@@ -601,8 +599,8 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         // airflow.configuration
         ["airflow", "configuration", rest @ ("as_dict" | "get" | "getboolean" | "getfloat" | "getint" | "has_option"
         | "remove_option" | "set")] => Replacement::SourceModuleMoved {
-            name: (*rest).to_string(),
             module: "airflow.configuration.conf",
+            name: (*rest).to_string(),
         },
 
         // airflow.contrib.*
@@ -622,7 +620,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         }
         // airflow.datasets
         ["airflow", "Dataset"] | ["airflow", "datasets", "Dataset"] => Replacement::AutoImport {
-            path: "airflow.sdk",
+            module: "airflow.sdk",
             name: "Asset",
         },
         ["airflow", "datasets", rest] => match *rest {
@@ -670,8 +668,8 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         // airflow.models.baseoperator
         ["airflow", "models", "baseoperator", rest] => match *rest {
             "chain" | "chain_linear" | "cross_downstream" => Replacement::SourceModuleMoved {
-                name: (*rest).to_string(),
                 module: "airflow.sdk",
+                name: (*rest).to_string(),
             },
             "BaseOperatorLink" => {
                 Replacement::Name("airflow.sdk.definitions.baseoperatorlink.BaseOperatorLink")
@@ -881,10 +879,10 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         range,
     );
 
-    if let Replacement::AutoImport { path, name } = replacement {
+    if let Replacement::AutoImport { module, name } = replacement {
         diagnostic.try_set_fix(|| {
             let (import_edit, binding) = checker.importer().get_or_import_symbol(
-                &ImportRequest::import_from(path, name),
+                &ImportRequest::import_from(module, name),
                 expr.start(),
                 checker.semantic(),
             )?;