Upgrade to compatibility with rust edition 2024 #200
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
pchickey
force-pushed
the
pch/edition_2024
branch
2 times, most recently
from
3052f83 to
e482ef9
Compare
|
Does that effectively bump |
pchickey
force-pushed
the
pch/edition_2024
branch
from
e482ef9 to
633f51a
Compare
|
Yes, it would. Is that a problem? We don't have to land this now - it could wait, or we could make a separate CI build that modifies it to 2024 and then runs checks while actually keeping it at 2021 - but remembering there are different edition rules across related projects is a mental overhead I'm trying to resolve. |
pchickey
force-pushed
the
pch/edition_2024
branch
from
633f51a to
88ffcab
Compare
We want to support Rust toolchains avaliable in RHEL, Alpine and Ubuntu LTS, to allow building distribution packages of ngx-rust based modules. Currently, that limits us to 1.82.0. |
|
OK: I will remove the upgrade of edition and msrv, I will switch this to lint that the libraries are compatible with the 2024 edition, which keeps the upgrade delta pretty small. |
pchickey
force-pushed
the
pch/edition_2024
branch
3 times, most recently
from
20b75fc to
3896684
Compare
pchickey
changed the title
pchickey
force-pushed
the
pch/edition_2024
branch
3 times, most recently
from
1688760 to
737e368
Compare
pchickey
force-pushed
the
pch/edition_2024
branch
from
737e368 to
77216ba
Compare
pchickey
changed the title
pchickey
force-pushed
the
pch/edition_2024
branch
2 times, most recently
from
254a706 to
cd1940f
Compare
enforced by workspace level lints, now specified in each Cargo.toml, except nginx-sys, because bindgen can't be set to Edition2024 until MSRV hits 1.85 this change set is created automatically by `cargo fix --edition --all`, then with manual fixes afterwards: * Back out any use of unsafe(no_mangle) for plain no_mangle, since 1.81 wont accept it * remove uses of expr_2021 in macros, which is not available in the MSRV. * Manual fix to ngx_container_of! macro for safety rules in 2024, these weren't migrated automatically by `cargo fix` * Manual fixes to several other macros that created an &mut Request in an expression, Rust 2024 is stricter about taking &mut of temporaries, so instead the request is let-bound first.
pchickey
force-pushed
the
pch/edition_2024
branch
from
cd1940f to
dadcb3e
Compare
7 tasks
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.
Proposed changes
We can't actually upgrade to edition 2024, because the MSRV is currently stuck on 1.81 for LTS linux packaging, and 2024 shipped in 1.85. But, in order to have a consistent set of rules (especially around
unsafe) to follow across Rust projects with a newer MSRV, make this source tree forwards-compatible to 2024.Automatically make changes to source of all crates using
cargo fix --edition --all, then all of the manual fixes required after that.Add workspace level lints for
rust-2024-compatibility, allowing the expr fragment specifier case which I don't expect to matter and is unstable when building with 1.81Checklist
Before creating a PR, run through this checklist and mark each as complete.