From 08809a6f3a5a71bc9f29bdeb3f8232f767cb7124 Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Wed, 25 Feb 2026 11:41:25 +0800 Subject: [PATCH] Revert "Workaround rustfmt panic on `quote!(Self(#var))` in Rust 1.93.0 (#22669)" This reverts commit 304265be5be20970668b202891f203f37172c88e. The root cause for the rustfmt panic was fixed in which was included in the Rust 1.93.1 point release. --- crates/bevy_reflect/derive/src/from_reflect.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/crates/bevy_reflect/derive/src/from_reflect.rs b/crates/bevy_reflect/derive/src/from_reflect.rs index a0f3ec43ad079..e046705f5bdb2 100644 --- a/crates/bevy_reflect/derive/src/from_reflect.rs +++ b/crates/bevy_reflect/derive/src/from_reflect.rs @@ -146,11 +146,6 @@ 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() { @@ -162,10 +157,10 @@ fn impl_struct_internal( ( quote!(#remote_ty), quote!(#constructor), - quote!(#self_ty(#__this)), + quote!(Self(#__this)), ) } else { - (quote!(#self_ty), quote!(#self_ty), quote!(#__this)) + (quote!(Self), quote!(Self), quote!(#__this)) }; let constructor = if is_defaultable {