Skip to content

Commit f408672

Browse files
committed
chore: bump Rust edition to 2024 and apply cargo fix + clippy updates
Run `cargo fix --edition` and resolve resulting warnings: - Add `use<>` syntax to `impl Trait` return types (auto-fixed) - Fix Rust 2024 temporary drop order change by simplifying `_initial_reconcile_rx` handling
1 parent 62f8273 commit f408672

4 files changed

Lines changed: 4 additions & 4 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/zookeeper-operator"
1111

1212
[workspace.dependencies]

rust/operator-binary/src/discovery.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pub fn build_discovery_configmap(
137137
fn listener_addresses(
138138
listener: &listener::v1alpha1::Listener,
139139
port_name: &str,
140-
) -> Result<impl IntoIterator<Item = (String, u16)>> {
140+
) -> Result<impl IntoIterator<Item = (String, u16)> + use<>> {
141141
// Get addresses port pairs for addresses that have a port with the name that matches the one we are interested in
142142
let address_port_pairs = listener
143143
.status

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)