primitive fix

Author: soqb

crates/bevy_reflect/bevy_reflect_derive/src/derive_data.rs

@@ -3,7 +3,7 @@ use crate::field_attributes::{parse_field_attrs, ReflectFieldAttr};
 use crate::type_path::parse_path_no_leading_colon;
 use crate::utility::members_to_serialization_denylist;
 use bit_set::BitSet;
-use quote::{quote, ToTokens, TokenStreamExt};
+use quote::{quote, ToTokens};
 
 use crate::{
     utility, REFLECT_ATTRIBUTE_NAME, REFLECT_VALUE_ATTRIBUTE_NAME, TYPE_NAME_ATTRIBUTE_NAME,

crates/bevy_reflect/bevy_reflect_derive/src/impls/typed.rs

@@ -8,6 +8,14 @@ pub(crate) fn type_path_generator(meta: &ReflectMeta) -> proc_macro2::TokenStrea
     let path_to_type = meta.path_to_type();
     let generics = meta.generics();
     let bevy_reflect_path = meta.bevy_reflect_path();
+    
+    if let PathToType::Primitive(name) = path_to_type {
+        let name = LitStr::new(&name.to_string(), name.span());
+        return quote! {
+            #bevy_reflect_path::utility::TypePathStorage::new_primitive(#name)
+        };
+    }
+    
     // Whether to use `GenericTypedCell` is not dependent on lifetimes
     // (which all have to be 'static anyway).
     let is_generic = !generics
@@ -65,15 +73,7 @@ pub(crate) fn type_path_generator(meta: &ReflectMeta) -> proc_macro2::TokenStrea
         }
     };
 
-    if let PathToType::Primitive(name) = path_to_type {
-        quote! {
-            #bevy_reflect_path::utility::TypePathStorage::new_primitive(
-                #path,
-                #short_path,
-                #name,
-            )
-        }
-    } else if !path_to_type.is_named() {
+    if !path_to_type.is_named() {
         quote! {
             #bevy_reflect_path::utility::TypePathStorage::new_anonymous(
                 #path,
@@ -147,12 +147,10 @@ pub(crate) fn impl_type_path(meta: &ReflectMeta) -> proc_macro2::TokenStream {
 
     let primitive_assert = if let PathToType::Primitive(_) = path_to_type {
         Some(quote! {
-            const _: () = {
-                mod private_scope {
-                    // Compiles if it can be named with its ident when there are no imports.
-                    type AssertIsPrimitive = #path_to_type;
-                }
-            };
+            mod private_scope {
+                // Compiles if it can be named with its ident when there are no imports.
+                type AssertIsPrimitive = #path_to_type;
+            }
         })
     } else {
         None