Skip to content

Update to edition 2024 #4311

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.

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

Merged
merged 1 commit into from
May 8, 2025
Merged

Update to edition 2024 #4311

merged 1 commit into from
May 8, 2025

Conversation

est31
Copy link
Member

@est31 est31 commented May 6, 2025

Updates everything but the tests to edition 2024, of which a bunch are failing on older editions.

The edition 2024 is a prerequisite for removal of the #![feature(let_chains)], and to forbidding let chains on edition 2021. I will do this in a later PR.

rust-lang/rust#140722

@est31 est31 force-pushed the edition_2024 branch 2 times, most recently from a0f0a8b to 47295e8 Compare May 7, 2025 00:00
Copy link
Member

Choose a reason for hiding this comment

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

This might be easier if you only update Miri itself, not all the test / benchmark crates.

#[no_mangle]
extern "C" fn use_the_dependency() {
#[unsafe(no_mangle)]
unsafe extern "C" fn use_the_dependency() {
Copy link
Member

Choose a reason for hiding this comment

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

Why did you make this function unsafe?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fair point, it's not required indeed.

@RalfJung
Copy link
Member

RalfJung commented May 8, 2025

@rustbot author

@rustbot rustbot added the S-waiting-on-author Status: Waiting for the PR author to address review comments label May 8, 2025
@rustbot
Copy link
Collaborator

rustbot commented May 8, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@est31
Copy link
Member Author

est31 commented May 8, 2025

@RalfJung I have removed the changes to cargo-miri benches and tests and only updated miri itself, as well as miri-script and cargo-miri. This should be smaller overall. I have the changes to the benches and tests in a separate branch here.

@RalfJung
Copy link
Member

RalfJung commented May 8, 2025

This looks great, thanks! Please squash the commits using ./miri squash. Then write @rustbot ready after you pushed the squashed PR.

@rustbot author

Also update the format edition to 2024
@est31
Copy link
Member Author

est31 commented May 8, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Waiting for a review to complete and removed S-waiting-on-author Status: Waiting for the PR author to address review comments labels May 8, 2025
@RalfJung RalfJung enabled auto-merge May 8, 2025 15:13
@RalfJung RalfJung added this pull request to the merge queue May 8, 2025
Merged via the queue into rust-lang:master with commit 4991cc4 May 8, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Waiting for a review to complete
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants