Skip to content

Conversation

@jeckersb
Copy link
Collaborator

@jeckersb jeckersb commented Sep 18, 2025

  • rust-1.90: Fix warnings on unnecessary parentheses
  • rust-1.90: Remove newly-detected dead code
  • rust-1.90: Update MSRV to 1.84.0

Closes: #1605

@bootc-bot bootc-bot bot requested a review from henrywang September 18, 2025 14:43
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces a set of changes to ensure compatibility with Rust 1.90. The modifications include updating the Minimum Supported Rust Version (MSRV) to 1.84.0, removing dead code identified by the new compiler version, and fixing new warnings about unnecessary parentheses. The changes are correct, well-contained, and improve the overall health of the codebase. This is a solid maintenance update.

@jeckersb
Copy link
Collaborator Author

Hm errors seem like fallout from #1619 ?


#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
#[serde(rename_all = "kebab-case")]
pub(crate) enum VerityState {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Edited to add a Closes: #1605

# In general we try to keep this pinned to what's in the latest RHEL9.
# However right now, we bumped to 1.82 as that's what composefs-rs uses.
rust-version = "1.82.0"
rust-version = "1.84.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

What's in c9s now is 1.88 so we can bump to that; what made you choose 1.84?

I guess really this should be updated by renovate.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh sorry it's in the commit message. Yeah fine as is.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I asked brew what was in rhel-9.6.0 to be conservative

@cgwalters
Copy link
Collaborator

Hm errors seem like fallout from #1619 ?

Yes, though not obvious to me how that PR could have merged but this one fails

@jeckersb
Copy link
Collaborator Author

Hm errors seem like fallout from #1619 ?

Yes, though not obvious to me how that PR could have merged but this one fails

FWIW I can reproduce the CI errors on main with just build-integration-test-image, still a bit confused though, will look more after lunch if you haven't already had an epiphany and fixed it 😄

@cgwalters cgwalters enabled auto-merge September 18, 2025 19:52
@cgwalters
Copy link
Collaborator

This will just need rebasing once #1628 lands otherwise LGTM

We already required at least 1.83.0 since we're using `Option::unwrap`
in const context in a few places, but rust-1.90 now correctly points
this out and emits an error.

RHEL 9.6 is on 1.84.0 so bump to match that.

Signed-off-by: John Eckersberg <[email protected]>
@cgwalters cgwalters merged commit 8aff03a into bootc-dev:main Sep 18, 2025
56 of 60 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cannot install from source

2 participants