Skip to content

Bump bevy_reflect MSRV to 1.95.0 and revert "Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 (#22669)"#23139

Merged
alice-i-cecile merged 2 commits into
bevyengine:mainfrom
jieyouxu:revert-rustfmt-workaround
Jun 9, 2026
Merged

Bump bevy_reflect MSRV to 1.95.0 and revert "Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 (#22669)"#23139
alice-i-cecile merged 2 commits into
bevyengine:mainfrom
jieyouxu:revert-rustfmt-workaround

Conversation

@jieyouxu

@jieyouxu jieyouxu commented Feb 25, 2026

Copy link
Copy Markdown
Contributor

Objective

The root cause for the rustfmt ICE was fixed in rust-lang/rust#150590 which was included in the Rust 1.93.1 point release.

Solution

Testing

@github-actions

Copy link
Copy Markdown
Contributor

Welcome, new contributor!

Please make sure you've read our contributing guide and we look forward to reviewing your pull request shortly ✨

@alice-i-cecile

Copy link
Copy Markdown
Member

Nice thanks!

@alice-i-cecile alice-i-cecile added D-Trivial Nice and easy! A great choice to get started with Bevy C-Code-Quality A section of code that is hard to understand or change S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it labels Feb 25, 2026
@alice-i-cecile alice-i-cecile added A-Reflection Runtime information about types D-Macros Code that generates Rust code labels Feb 25, 2026
@github-project-automation github-project-automation Bot moved this to Needs SME Triage in Reflection Feb 25, 2026
@mockersf

Copy link
Copy Markdown
Member

We should wait for Bevy to use the 1.93.1 as the MSRV before merging this.

Or update Bevy MSRV in it

@alice-i-cecile alice-i-cecile added S-Waiting-on-Author The author needs to make changes or address concerns before this can be merged and removed S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it labels Mar 2, 2026
@amtep

amtep commented May 2, 2026

Copy link
Copy Markdown
Contributor

bevy rust-version was updated to 1.95.0 in 4fd09ff :)

However the rust-version in crates/bevy_reflect/Cargo.toml is stil at 1.87.0

Do both need to be updated?

@alice-i-cecile

Copy link
Copy Markdown
Member

Yes, both should be updated here.

@MrGVSV

MrGVSV commented Jun 7, 2026

Copy link
Copy Markdown
Member

@jieyouxu could you update the rust-version in crates/bevy_reflect/Cargo.toml to match the main Cargo.toml (i.e. 1.95.0)? Otherwise, the changes look good to me!

….0 (bevyengine#22669)"

This reverts commit 304265b.

The root cause for the rustfmt panic was fixed in
<rust-lang/rust#150590> which was included in
the Rust 1.93.1 point release.
@jieyouxu jieyouxu changed the title Revert "Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 (#22669)" Bump bevy_reflect MSRV to 1.95.0 and revert "Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 (#22669)" Jun 8, 2026
@jieyouxu jieyouxu force-pushed the revert-rustfmt-workaround branch from a29c69f to b136513 Compare June 8, 2026 01:14
@jieyouxu

jieyouxu commented Jun 8, 2026

Copy link
Copy Markdown
Contributor Author

Changes since last review:

  • Rebased.
  • Pushed another commit to bump bevy_reflect MSRV to 1.95.0.

@MrGVSV MrGVSV added S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it and removed S-Waiting-on-Author The author needs to make changes or address concerns before this can be merged labels Jun 8, 2026
@MrGVSV MrGVSV moved this from Needs SME Triage to SME Triaged in Reflection Jun 8, 2026
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Jun 8, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 8, 2026
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Jun 9, 2026
Merged via the queue into bevyengine:main with commit 3e40895 Jun 9, 2026
44 checks passed
@github-project-automation github-project-automation Bot moved this from SME Triaged to Done in Reflection Jun 9, 2026
@jieyouxu jieyouxu deleted the revert-rustfmt-workaround branch June 9, 2026 03:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Reflection Runtime information about types C-Code-Quality A section of code that is hard to understand or change D-Macros Code that generates Rust code D-Trivial Nice and easy! A great choice to get started with Bevy S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants