Skip to content

chore: bump Rust edition to 2024 and update dependencies + clippy#710

Open
Saul-STFC wants to merge 2 commits into
stackabletech:mainfrom
Saul-STFC:rust-2024-upgrade
Open

chore: bump Rust edition to 2024 and update dependencies + clippy#710
Saul-STFC wants to merge 2 commits into
stackabletech:mainfrom
Saul-STFC:rust-2024-upgrade

Conversation

@Saul-STFC
Copy link
Copy Markdown

@Saul-STFC Saul-STFC commented Jun 2, 2026

Upgrade workspace and crates to Rust 2024 edition and apply tool-driven fixes:

  • Bump Rust edition from 2021 to 2024
  • Adding edition.workspace = true to p12 and changing minimum rust version to 1.85.0
  • Update rustls-webpki dependency to 0.103.13 to fix security vulnerability warnings
  • Apply cargo fix --edition changes
    • Add use<> lifetime capture in impl Trait return types for iterators
  • Apply Clippy suggestions and minor refactors

Description

Please add a description here. This will become the commit message of the merge request later.

Definition of Done Checklist

  • Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant
  • Please make sure all these things are done and tick the boxes

Author

  • Changes are OpenShift compatible
  • CRD changes approved
  • CRD documentation for all fields, following the style guide.
  • Helm chart can be installed and deployed operator works
  • Integration tests passed (for non trivial changes)
  • Changes need to be "offline" compatible
  • Links to generated (nightly) docs added
  • Release note snippet added

Reviewer

  • Code contains useful comments
  • Code contains useful logging statements
  • (Integration-)Test cases added
  • Documentation added or updated. Follows the style guide.
  • Changelog updated
  • Cargo.toml only contains references to git tags (not specific commits or branches)

Acceptance

  • Feature Tracker has been updated
  • Proper release label has been added
  • Links to generated (nightly) docs added
  • Release note snippet added
  • Add type/deprecation label & add to the deprecation schedule
  • Add type/experimental label & add to the experimental features tracker

…actors

Upgrade workspace and crates to Rust 2024 edition and apply tool-driven fixes:

- Bump Rust edition from 2021 to 2024 across workspace crates (Cargo.toml, Cargo.nix)
- Update `rustls-webpki` dependency to 0.103.13
- Apply `cargo fix --edition` changes
  - Add `use<>` lifetime capture in `impl Trait` return types for iterators
- Apply Clippy suggestions and minor refactors
  - Simplify iterator-returning functions with correct lifetime capture syntax
  - Refactor `trystream_any` to fix warning
while let Some(value) = stream.next().await {
if let Ok(true) | Err(_) = value {
return value;
loop {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally found the existing code a bit easier to read to be honest.
But I let you decide if we want to keep it and silence clippy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me too, I agree

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case I suggest we slap a #[allow(clippy::xxx)] at the existing code and keep that

Comment thread rust/p12/src/lib.rs
Comment thread rust/p12/src/lib.rs
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a bit of mixed feelings about touching rust/p12. As documented in rust/p12/README.md it's a fork of https://github.com/hjiayz/p12/. We can hopefully get rid of it eventually.
So it's nice to maintain it, on the other hand this increases the diff to upstream...

@sbernauer sbernauer moved this from Development: Waiting for Review to Development: In Review in Stackable Engineering Jun 3, 2026
Explicitly selecting TryFutureExt::into_future
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Development: In Review

Development

Successfully merging this pull request may close these issues.

3 participants