Skip to content

chore: Bump Rust edition to 2024 #899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Techassi merged 2 commits into from
Jun 8, 2026
Merged

chore: Bump Rust edition to 2024 #899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f2e0f8
chore: bump Rust edition to 2024 and apply cargo fix + clippy updates
Saul-STFC Jun 1, 2026
cfc542a
Chore: Fix rustfmt errors
Saul-STFC Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolver = "2"
version = "0.0.0-dev"
authors = ["Stackable GmbH <info@stackable.tech>"]
license = "OSL-3.0"
edition = "2021"
edition = "2024"
repository = "https://github.com/stackabletech/trino-operator"

[workspace.dependencies]
Expand Down
5 changes: 2 additions & 3 deletions rust/operator-binary/src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,8 @@ pub async fn reconcile_trino(
);
}

if let Some(listener_class) = trino_role.listener_class_name(trino) {
if let Some(listener_group_name) = group_listener_name(trino, &trino_role) {
if let Some(listener_class) = trino_role.listener_class_name(trino)
&& let Some(listener_group_name) = group_listener_name(trino, &trino_role) {
let role_group_listener = build_group_listener(
trino,
build_recommended_labels(
Expand All @@ -546,7 +546,6 @@ pub async fn reconcile_trino(
.await
.context(ApplyGroupListenerSnafu)?;
}
}

let role_config = trino.generic_role_config(&trino_role);
if let Some(GenericRoleConfig {
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/webhooks/conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub async fn create_webhook_server(
field_manager: FIELD_MANAGER.to_owned(),
};

let (conversion_webhook, _initial_reconcile_rx) =
let (conversion_webhook, _) =
ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);

let webhook_server_options = WebhookServerOptions {
Expand Down
Loading