Skip to content

Commit 25b84b6

Browse files
authored
feat: bump Rust edition to 2024 (#802)
1 parent aa855ab commit 25b84b6

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

Cargo.nix

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resolver = "2"
66
version = "0.0.0-dev"
77
authors = ["Stackable GmbH <info@stackable.tech>"]
88
license = "OSL-3.0"
9-
edition = "2021"
9+
edition = "2024"
1010
repository = "https://github.com/stackabletech/airflow-operator"
1111

1212
[workspace.dependencies]

rust/operator-binary/src/airflow_controller.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -483,25 +483,25 @@ pub async fn reconcile_airflow(
483483
.context(FailedToCreatePdbSnafu)?;
484484
}
485485

486-
if let Some(listener_class) = &role_config.listener_class {
487-
if let Some(listener_group_name) = &role_config.group_listener_name {
488-
let rg_group_listener = build_group_listener(
486+
if let Some(listener_class) = &role_config.listener_class
487+
&& let Some(listener_group_name) = &role_config.group_listener_name
488+
{
489+
let rg_group_listener = build_group_listener(
490+
airflow,
491+
build_recommended_labels(
489492
airflow,
490-
build_recommended_labels(
491-
airflow,
492-
AIRFLOW_CONTROLLER_NAME,
493-
&validated.image.app_version_label_value,
494-
&role_name,
495-
"none",
496-
),
497-
listener_class.to_string(),
498-
listener_group_name.clone(),
499-
)?;
500-
cluster_resources
501-
.add(client, rg_group_listener)
502-
.await
503-
.context(ApplyGroupListenerSnafu)?;
504-
}
493+
AIRFLOW_CONTROLLER_NAME,
494+
&validated.image.app_version_label_value,
495+
&role_name,
496+
"none",
497+
),
498+
listener_class.to_string(),
499+
listener_group_name.clone(),
500+
)?;
501+
cluster_resources
502+
.add(client, rg_group_listener)
503+
.await
504+
.context(ApplyGroupListenerSnafu)?;
505505
}
506506
}
507507

0 commit comments

Comments
 (0)