Revert "Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 (#22669)"#23139
Open
jieyouxu wants to merge 1 commit intobevyengine:mainfrom
Open
Revert "Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 (#22669)"#23139jieyouxu wants to merge 1 commit intobevyengine:mainfrom
quote!(Self(#var)) in Rust 1.93.0 (#22669)"#23139jieyouxu wants to merge 1 commit intobevyengine:mainfrom
Conversation
….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.
Contributor
|
Welcome, new contributor! Please make sure you've read our contributing guide and we look forward to reviewing your pull request shortly ✨ |
Member
|
Nice thanks! |
alice-i-cecile
added
D-Trivial
alice-i-cecile
approved these changes
Feb 25, 2026
alice-i-cecile
added
A-Reflection
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
added
S-Waiting-on-Author
|
bevy rust-version was updated to 1.95.0 in 4fd09ff :) However the rust-version in Do both need to be updated? |
Member
|
Yes, both should be updated here. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Objective
This PR reverts #22669 since the temporary workaround should no longer be needed in 1.93.1+.
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
Plain revert.
Testing
rust-lang/rustregression test: https://github.com/rust-lang/rust/blob/859951e3c7c9d0322c39bad49221937455bdffcd/tests/ui/parser/macro/kw-in-item-pos-recovery-149692.rscargo +stable fmtof Rust 1.93.1 toolchain locally does not ICE (rustfmt 1.8.0-stable (01f6ddf758 2026-02-11))cargo +1.93.0 fmtdoes.