Skip to content

chore: Bump Rust edition to 2024#710

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

chore: Bump Rust edition to 2024#710
Saul-STFC wants to merge 7 commits into
stackabletech:mainfrom
Saul-STFC:rust-2024-upgrade

Conversation

@Saul-STFC

@Saul-STFC Saul-STFC commented Jun 2, 2026 •
edited
Loading

Copy link
Copy Markdown

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

@Saul-STFC
chore: bump Rust edition to 2024 and update dependencies + clippy ref…
fd0995b 
…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
@Saul-STFC Saul-STFC force-pushed the rust-2024-upgrade branch from ea1e686 to fd0995b Compare June 2, 2026 11:11
@NickLarsenNZ NickLarsenNZ moved this to Development: Waiting for Review in Stackable Engineering Jun 2, 2026
@NickLarsenNZ NickLarsenNZ mentioned this pull request Jun 2, 2026
Open
17 tasks
sbernauer
sbernauer reviewed Jun 3, 2026
View reviewed changes
Comment thread rust/operator-binary/src/utils.rs Outdated
Comment thread rust/p12/src/lib.rs Outdated
Comment thread rust/p12/src/lib.rs

@sbernauer sbernauer Jun 3, 2026

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...

@NickLarsenNZ NickLarsenNZ Jun 18, 2026

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.

Fair. Although I'm unsure we have really maintained it (apologies if we do, and I missed it).

In this case, shall we leave p12 on 2021? Is cargo ok with multiple workspace members using different editions?

@sbernauer sbernauer Jun 25, 2026 •
edited
Loading

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 this case, shall we leave p12 on 2021?

No strong opinion, I don't think it matters that much

@NickLarsenNZ NickLarsenNZ Jun 29, 2026 •
edited
Loading

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.

Hmm, I guess we can leave it on 2021 if we want it to match upstream.

@Saul-STFC Saul-STFC Jul 1, 2026

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.

I have kept p12 on edition 2021

@sbernauer sbernauer Jul 1, 2026

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.

Thx, LGTM for me

@sbernauer sbernauer moved this from Development: Waiting for Review to Development: In Review in Stackable Engineering Jun 3, 2026
@Saul-STFC
fix(krb5-provision-keytab): disambiguate into_future in CredentialCache
5ce2a57 
Explicitly selecting TryFutureExt::into_future
@Techassi Techassi changed the title chore: bump Rust edition to 2024 and update dependencies + clippy chore: Bump Rust edition to 2024 Jun 8, 2026
sbernauer
sbernauer previously approved these changes Jun 25, 2026
View reviewed changes

@sbernauer sbernauer left a comment

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.

For me that's sufficient :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NickLarsenNZ NickLarsenNZ NickLarsenNZ left review comments
@sbernauer sbernauer sbernauer approved these changes
+1 more reviewer
@nightkr nightkr nightkr left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Saul-STFC Saul-STFC

Labels

None yet

Projects

Stackable Engineering
Status: Development: In Review

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Saul-STFC @nightkr @NickLarsenNZ @sbernauer