Skip to content

Commit 7afbc2e

Browse files
authored
chore: bump Rust edition to 2024 and apply cargo fix (#764)
- Fix temporary drop order change in Rust 2024 by explicitly dropping `_initial_reconcile_rx` - Add `use<>` syntax to `impl Trait` return types (auto-fixed)
1 parent 45a2111 commit 7afbc2e

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/hbase-operator"
1111

1212
[workspace.dependencies]

rust/operator-binary/src/crd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ impl v1alpha1::HbaseCluster {
399399
(
400400
Vec<PropertyNameKind>,
401401
Role<
402-
impl Configuration<Configurable = Self>,
402+
impl Configuration<Configurable = Self> + use<>,
403403
v1alpha1::HbaseConfigOverrides,
404404
GenericRoleConfig,
405405
JavaCommonConfig,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub async fn create_webhook_server(
3737
field_manager: FIELD_MANAGER.to_owned(),
3838
};
3939

40-
let (conversion_webhook, _initial_reconcile_rx) =
40+
let (conversion_webhook, _) =
4141
ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);
4242

4343
let webhook_server_options = WebhookServerOptions {

0 commit comments

Comments
 (0)