Skip to content

chore: Bump Rust edition to 2024 #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Saul-STFC wants to merge 7 commits into
base: main
Choose a base branch
from
Open

chore: Bump Rust edition to 2024 #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd0995b
chore: bump Rust edition to 2024 and update dependencies + clippy ref…
Saul-STFC Jun 1, 2026
5ce2a57
fix(krb5-provision-keytab): disambiguate into_future in CredentialCache
Saul-STFC Jun 3, 2026
e9b7378
Merge branch 'main' into rust-2024-upgrade
sbernauer Jun 25, 2026
79d424f
Merge branch 'stackabletech:main' into rust-2024-upgrade
Saul-STFC Jun 25, 2026
7a8d9bb
Refactor: Ignore clippy, reverting loop and update git2 due to advisory
Saul-STFC Jun 25, 2026
6cf367c
Fix: Update anyhow to address RustSec advisories, reverting p12 to 20…
Saul-STFC Jul 1, 2026
b6f5637
Merge branch 'main' into rust-2024-upgrade
Saul-STFC Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 8 additions & 39 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

105 changes: 15 additions & 90 deletions Cargo.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,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/secret-operator"

[workspace.dependencies]
Expand Down
5 changes: 2 additions & 3 deletions rust/krb5-provision-keytab/src/credential_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,9 @@ impl CredentialCache {
.expect("key was just confirmed to exist in cache")))
} else {
tracing::info!("credential not found in cache, generating...");
match mk_value(Ctx {
match TryFutureExt::into_future(mk_value(Ctx {
cache_ref: self.cache_ref.clone(),
})
.into_future()
}))
.await
{
Ok(value) => {
Expand Down
4 changes: 2 additions & 2 deletions rust/operator-binary/src/crd/secret_class/v1alpha1_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl SecretClassBackend {
pub fn refers_to_config_map(
&self,
config_map: &PartialObjectMeta<ConfigMap>,
) -> impl Iterator<Item = SearchNamespaceMatchCondition> {
) -> impl Iterator<Item = SearchNamespaceMatchCondition> + use<> {
let cm_namespace = config_map.metadata.namespace.as_deref();
match self {
Self::K8sSearch(backend) => {
Expand All @@ -40,7 +40,7 @@ impl SecretClassBackend {
pub fn refers_to_secret(
&self,
secret: &PartialObjectMeta<Secret>,
) -> impl Iterator<Item = SearchNamespaceMatchCondition> {
) -> impl Iterator<Item = SearchNamespaceMatchCondition> + use<> {
match self {
Self::AutoTls(backend) => {
(backend.ca.secret == *secret).then_some(SearchNamespaceMatchCondition::True)
Expand Down
4 changes: 2 additions & 2 deletions rust/operator-binary/src/crd/secret_class/v1alpha2_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl SecretClassBackend {
pub fn refers_to_config_map(
&self,
config_map: &PartialObjectMeta<ConfigMap>,
) -> impl Iterator<Item = SearchNamespaceMatchCondition> {
) -> impl Iterator<Item = SearchNamespaceMatchCondition> + use<> {
let cm_namespace = config_map.metadata.namespace.as_deref();
match self {
Self::K8sSearch(backend) => {
Expand All @@ -46,7 +46,7 @@ impl SecretClassBackend {
pub fn refers_to_secret(
&self,
secret: &PartialObjectMeta<Secret>,
) -> impl Iterator<Item = SearchNamespaceMatchCondition> {
) -> impl Iterator<Item = SearchNamespaceMatchCondition> + use<> {
match self {
Self::AutoTls(backend) => {
(backend.ca.secret == *secret).then_some(SearchNamespaceMatchCondition::True)
Expand Down
1 change: 1 addition & 0 deletions rust/operator-binary/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ pub fn error_full_message(err: &dyn std::error::Error) -> String {
}

/// Propagates `Ok(true)` and `Err(_)` from `stream`, otherwise returns `Ok(false)`.
#[allow(tail_expr_drop_order)]
pub async fn trystream_any<S: Stream<Item = Result<bool, E>>, E>(stream: S) -> Result<bool, E> {
pin_mut!(stream);
while let Some(value) = stream.next().await {
Expand Down
2 changes: 1 addition & 1 deletion rust/p12/src/lib.rs
View file
Open in desktop

@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

Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ fn pbepkcs12sha1core(d: &[u8], i: &[u8], a: &mut Vec<u8>, iterations: u64) -> Ve
a.append(&mut ai.clone());
ai
}

#[allow(clippy::manual_div_ceil)] // This is a fork, ignoring errors
#[allow(clippy::many_single_char_names)]
fn pbepkcs12sha1(pass: &[u8], salt: &[u8], iterations: u64, id: u8, size: u64) -> Vec<u8> {
const U: u64 = 160 / 8;
Expand Down
Loading