Skip to content

Commit 6d1ad47

Browse files
committed
refactor(AIR302): remove unnecessary Some in check_method
1 parent f03d9a7 commit 6d1ad47

File tree

1 file changed

+35
-37
lines changed

1 file changed

+35
-37
lines changed

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

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -451,68 +451,66 @@ fn check_method(checker: &Checker, call_expr: &ExprCall) {
451451

452452
let replacement = match qualname.segments() {
453453
["airflow", "datasets", "manager", "DatasetManager"] => match attr.as_str() {
454-
"register_dataset_change" => Some(Replacement::Name("register_asset_change")),
455-
"create_datasets" => Some(Replacement::Name("create_assets")),
456-
"notify_dataset_created" => Some(Replacement::Name("notify_asset_created")),
457-
"notify_dataset_changed" => Some(Replacement::Name("notify_asset_changed")),
458-
"notify_dataset_alias_created" => Some(Replacement::Name("notify_asset_alias_created")),
459-
_ => None,
454+
"register_dataset_change" => Replacement::Name("register_asset_change"),
455+
"create_datasets" => Replacement::Name("create_assets"),
456+
"notify_dataset_created" => Replacement::Name("notify_asset_created"),
457+
"notify_dataset_changed" => Replacement::Name("notify_asset_changed"),
458+
"notify_dataset_alias_created" => Replacement::Name("notify_asset_alias_created"),
459+
_ => return,
460460
},
461461
["airflow", "lineage", "hook", "HookLineageCollector"] => match attr.as_str() {
462-
"create_dataset" => Some(Replacement::Name("create_asset")),
463-
"add_input_dataset" => Some(Replacement::Name("add_input_asset")),
464-
"add_output_dataset" => Some(Replacement::Name("add_output_asset")),
465-
"collected_datasets" => Some(Replacement::Name("collected_assets")),
466-
_ => None,
462+
"create_dataset" => Replacement::Name("create_asset"),
463+
"add_input_dataset" => Replacement::Name("add_input_asset"),
464+
"add_output_dataset" => Replacement::Name("add_output_asset"),
465+
"collected_datasets" => Replacement::Name("collected_assets"),
466+
_ => return,
467467
},
468468
["airflow", "providers", "amazon", "auth_manager", "aws_auth_manager", "AwsAuthManager"] => {
469469
match attr.as_str() {
470-
"is_authorized_dataset" => Some(Replacement::Name("is_authorized_asset")),
471-
_ => None,
470+
"is_authorized_dataset" => Replacement::Name("is_authorized_asset"),
471+
_ => return,
472472
}
473473
}
474474
["airflow", "providers_manager", "ProvidersManager"] => match attr.as_str() {
475-
"initialize_providers_dataset_uri_resources" => Some(Replacement::Name(
476-
"initialize_providers_asset_uri_resources",
477-
)),
478-
_ => None,
475+
"initialize_providers_dataset_uri_resources" => {
476+
Replacement::Name("initialize_providers_asset_uri_resources")
477+
}
478+
_ => return,
479479
},
480480
["airflow", "secrets", "local_filesystem", "LocalFilesystemBackend"] => match attr.as_str()
481481
{
482-
"get_connections" => Some(Replacement::Name("get_connection")),
483-
_ => None,
482+
"get_connections" => Replacement::Name("get_connection"),
483+
_ => return,
484484
},
485485
["airflow", "datasets", ..] | ["airflow", "Dataset"] => match attr.as_str() {
486-
"iter_datasets" => Some(Replacement::Name("iter_assets")),
487-
"iter_dataset_aliases" => Some(Replacement::Name("iter_asset_aliases")),
488-
_ => None,
486+
"iter_datasets" => Replacement::Name("iter_assets"),
487+
"iter_dataset_aliases" => Replacement::Name("iter_asset_aliases"),
488+
_ => return,
489489
},
490490
segments => {
491491
if is_airflow_secret_backend(segments) {
492492
match attr.as_str() {
493-
"get_conn_uri" => Some(Replacement::Name("get_conn_value")),
494-
"get_connections" => Some(Replacement::Name("get_connection")),
495-
_ => None,
493+
"get_conn_uri" => Replacement::Name("get_conn_value"),
494+
"get_connections" => Replacement::Name("get_connection"),
495+
_ => return,
496496
}
497497
} else if is_airflow_hook(segments) {
498498
match attr.as_str() {
499-
"get_connections" => Some(Replacement::Name("get_connection")),
500-
_ => None,
499+
"get_connections" => Replacement::Name("get_connection"),
500+
_ => return,
501501
}
502502
} else {
503-
None
503+
return;
504504
}
505505
}
506506
};
507-
if let Some(replacement) = replacement {
508-
checker.report_diagnostic(Diagnostic::new(
509-
Airflow3Removal {
510-
deprecated: attr.to_string(),
511-
replacement,
512-
},
513-
attr.range(),
514-
));
515-
}
507+
checker.report_diagnostic(Diagnostic::new(
508+
Airflow3Removal {
509+
deprecated: attr.to_string(),
510+
replacement,
511+
},
512+
attr.range(),
513+
));
516514
}
517515

518516
/// Check whether a removed Airflow name is used.

0 commit comments

Comments
 (0)