Skip to content

Commit 6f2e0f8

Browse files
committed
chore: bump Rust edition to 2024 and apply cargo fix + clippy updates
- Apply `cargo fix --edition` changes - Use `&& let` chaining instead of nested `if let` (Clippy suggested) - Fix Rust 2024 drop order warning by dropping unused binding
1 parent df02b1f commit 6f2e0f8

4 files changed

Lines changed: 5 additions & 6 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/trino-operator"
1111

1212
[workspace.dependencies]

rust/operator-binary/src/controller.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ pub async fn reconcile_trino(
526526
);
527527
}
528528

529-
if let Some(listener_class) = trino_role.listener_class_name(trino) {
530-
if let Some(listener_group_name) = group_listener_name(trino, &trino_role) {
529+
if let Some(listener_class) = trino_role.listener_class_name(trino)
530+
&& let Some(listener_group_name) = group_listener_name(trino, &trino_role) {
531531
let role_group_listener = build_group_listener(
532532
trino,
533533
build_recommended_labels(
@@ -546,7 +546,6 @@ pub async fn reconcile_trino(
546546
.await
547547
.context(ApplyGroupListenerSnafu)?;
548548
}
549-
}
550549

551550
let role_config = trino.generic_role_config(&trino_role);
552551
if let Some(GenericRoleConfig {

rust/operator-binary/src/webhooks/conversion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub async fn create_webhook_server(
4646
field_manager: FIELD_MANAGER.to_owned(),
4747
};
4848

49-
let (conversion_webhook, _initial_reconcile_rx) =
49+
let (conversion_webhook, _) =
5050
ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);
5151

5252
let webhook_server_options = WebhookServerOptions {

0 commit comments

Comments
 (0)