Skip to content

Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 #22669

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.

Sign up for GitHub

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
alice-i-cecile merged 2 commits into from
Jan 26, 2026
Merged

Workaround rustfmt panic on quote!(Self(#var)) in Rust 1.93.0 #22669

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0ffd8
Workaround rustfmt panic on `quote!(Self(#var))` in Rust 1.93.0
natepiano Jan 23, 2026
ef7268a
Leave TODO note
alice-i-cecile Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/bevy_reflect/derive/src/from_reflect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ fn impl_struct_internal(
// The constructed "Self" ident
let __this = Ident::new("__this", Span::call_site());

// Workaround for rustfmt issue: https://github.com/rust-lang/rustfmt/issues/6779
// `quote!(Self(#__this))` causes rustfmt to panic in Rust 1.93.0+
// TODO: not needed after Rust 1.94
let self_ty = quote!(Self);

// The reflected type: either `Self` or a remote type
let (reflect_ty, constructor, retval) = if let Some(remote_ty) = remote_ty {
let constructor = match remote_ty.as_expr_path() {
Expand All @@ -157,10 +162,10 @@ fn impl_struct_internal(
(
quote!(#remote_ty),
quote!(#constructor),
quote!(Self(#__this)),
quote!(#self_ty(#__this)),
)
} else {
(quote!(Self), quote!(Self), quote!(#__this))
(quote!(#self_ty), quote!(#self_ty), quote!(#__this))
};

let constructor = if is_defaultable {
Expand Down