From 295d14f22d3c81debf2da3c7658b946ebaa2c2d4 Mon Sep 17 00:00:00 2001
From: Saul Beck <saul.beck@stfc.ac.uk>
Date: Mon, 1 Jun 2026 12:27:51 +0100
Subject: [PATCH] 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
---
 Cargo.nix                                       | 2 +-
 Cargo.toml                                      | 2 +-
 rust/operator-binary/src/discovery.rs           | 2 +-
 rust/operator-binary/src/webhooks/conversion.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.nix b/Cargo.nix
index 75415d97..69e41b94 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -9616,7 +9616,7 @@ rec {
       "stackable-kafka-operator" = rec {
         crateName = "stackable-kafka-operator";
         version = "0.0.0-dev";
-        edition = "2021";
+        edition = "2024";
         crateBin = [
           {
             name = "stackable-kafka-operator";
diff --git a/Cargo.toml b/Cargo.toml
index 8620a9ef..3647c4ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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/kafka-operator"
 
 [workspace.dependencies]
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
index e1603574..da927527 100644
--- a/rust/operator-binary/src/discovery.rs
+++ b/rust/operator-binary/src/discovery.rs
@@ -92,7 +92,7 @@ pub fn build_discovery_configmap(
 fn listener_hosts(
     listeners: &[listener::v1alpha1::Listener],
     port_name: &str,
-) -> Result<impl IntoIterator<Item = (String, u16)>, Error> {
+) -> Result<impl IntoIterator<Item = (String, u16)> + use<>, Error> {
     listeners
         .iter()
         .flat_map(|listener| {
diff --git a/rust/operator-binary/src/webhooks/conversion.rs b/rust/operator-binary/src/webhooks/conversion.rs
index a5b81a7f..912ea593 100644
--- a/rust/operator-binary/src/webhooks/conversion.rs
+++ b/rust/operator-binary/src/webhooks/conversion.rs
@@ -37,7 +37,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 {