bump to Rust edition 2024 & min = 1.85 #7423
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5125911 to
6dfeff0
Compare
There was a problem hiding this comment.
PR Overview
This PR updates the Rust toolchain requirements by bumping the Rust edition to 2024 and the minimum supported Rust version to 1.85.0. It also makes minor import reordering and formatting adjustments across multiple project files to align with the new edition requirements.
- Update Rust edition and minimum supported version in Cargo.toml files and related documentation.
- Modify unsafe blocks in fuzz targets wrapping env::set_var, and reorder imports in various source files.
- Update CI configuration to reflect the new minimum Rust version.
Reviewed Changes
| File | Description |
|---|---|
| Cargo.toml | Bumped rust-version to "1.85.0" and edition to "2024". |
| src/uu/*/Cargo.toml | Updated edition from "2021" to "2024" across multiple sub-crates. |
| fuzz/fuzz_targets/fuzz_expr.rs | Wrapped env::set_var in an unnecessary unsafe block. |
| fuzz/Cargo.toml | Updated edition from "2021" to "2024". |
| fuzz/fuzz_targets/fuzz_sort.rs | Wrapped env::set_var in an unnecessary unsafe block. |
| fuzz/fuzz_targets/fuzz_printf.rs | Wrapped env::set_var in an unnecessary unsafe block. |
| README.md | Updated MSRV badge and text to reflect version "1.85.0". |
| .github/workflows/CICD.yml | Updated RUST_MIN_SRV to "1.85.0". |
| src/uu/arch/src/arch.rs | Reordered clap imports for consistency. |
| src/uu/cat/src/cat.rs | Reordered module imports and simplified formatting. |
| src/uu/basename/src/basename.rs | Reordered clap and std::path imports for consistency. |
| build.rs | Minor formatting fix by adding a semicolon. |
| src/uu/base32/src/base_common.rs | Reordered imports to maintain a consistent order. |
| src/uu/basenc/src/basenc.rs | Reordered imports and updated the base_common usage for clarity. |
Copilot reviewed 326 out of 326 changed files in this pull request and generated 3 comments.
|
Android fails because rustc is 1.84: |
|
GNU testsuite comparison: |
|
This is blocked on termux/termux-packages#23469 |
|
GNU testsuite comparison: |
|
@sylvestre it looks like the blocking issue has been fixed in the meantime. |
357c547 to
31c8fd8
Compare
|
GNU testsuite comparison: |
|
@cakebaker it is green! :) |
|
@sylvestre good job :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.