chore: fix proc macro crate

Author: RobWalt

bevy-trait-query-impl/src/lib.rs

@@ -152,6 +152,30 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
         #where_clause
         {
             type ReadOnly = Self;
+
+            const IS_READ_ONLY: bool = true;
+
+            type Item<'__w> = #my_crate::ReadTraits<'__w, #trait_object>;
+
+            #[inline]
+            fn shrink<'wlong: 'wshort, 'wshort>(
+                item: Self::Item<'wlong>,
+            ) -> Self::Item<'wshort> {
+                item
+            }
+
+            #[inline]
+            unsafe fn fetch<'w>(
+                fetch: &mut Self::Fetch<'w>,
+                entity: #imports::Entity,
+                table_row: #imports::TableRow,
+            ) -> Self::Item<'w> {
+                <#my_crate::All<&#trait_object> as #imports::QueryData>::fetch(
+                    fetch,
+                    entity,
+                    table_row,
+                )
+            }
         }
         unsafe impl #impl_generics #imports::ReadOnlyQueryData for &#trait_object
         #where_clause
@@ -160,7 +184,6 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
         unsafe impl #impl_generics_with_lifetime #imports::WorldQuery for &'__a #trait_object
         #where_clause
         {
-            type Item<'__w> = #my_crate::ReadTraits<'__w, #trait_object>;
             type Fetch<'__w> = <#my_crate::All<&'__a #trait_object> as #imports::WorldQuery>::Fetch<'__w>;
             type State = #my_crate::TraitQueryState<#trait_object>;
 
@@ -179,13 +202,6 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
                 )
             }
 
-            #[inline]
-            fn shrink<'wlong: 'wshort, 'wshort>(
-                item: Self::Item<'wlong>,
-            ) -> Self::Item<'wshort> {
-                item
-            }
-
             const IS_DENSE: bool = <#my_crate::All<&#trait_object> as #imports::WorldQuery>::IS_DENSE;
 
             #[inline]
@@ -209,19 +225,6 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
                 <#my_crate::All<&#trait_object> as #imports::WorldQuery>::set_table(fetch, state, table);
             }
 
-            #[inline]
-            unsafe fn fetch<'w>(
-                fetch: &mut Self::Fetch<'w>,
-                entity: #imports::Entity,
-                table_row: #imports::TableRow,
-            ) -> Self::Item<'w> {
-                <#my_crate::All<&#trait_object> as #imports::WorldQuery>::fetch(
-                    fetch,
-                    entity,
-                    table_row,
-                )
-            }
-
             #[inline]
             fn update_component_access(
                 state: &Self::State,
@@ -261,12 +264,35 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
         #where_clause
         {
             type ReadOnly = &'__a #trait_object;
+
+            type Item<'__w> = #my_crate::WriteTraits<'__w, #trait_object>;
+
+            const IS_READ_ONLY: bool = false;
+
+            #[inline]
+            fn shrink<'wlong: 'wshort, 'wshort>(
+                item: Self::Item<'wlong>,
+            ) -> Self::Item<'wshort> {
+                item
+            }
+
+            #[inline]
+            unsafe fn fetch<'w>(
+                fetch: &mut Self::Fetch<'w>,
+                entity: #imports::Entity,
+                table_row: #imports::TableRow,
+            ) -> Self::Item<'w> {
+                <#my_crate::All<&mut #trait_object> as #imports::QueryData>::fetch(
+                    fetch,
+                    entity,
+                    table_row,
+                )
+            }
         }
 
         unsafe impl #impl_generics_with_lifetime #imports::WorldQuery for &'__a mut #trait_object
         #where_clause
         {
-            type Item<'__w> = #my_crate::WriteTraits<'__w, #trait_object>;
             type Fetch<'__w> = <#my_crate::All<&'__a #trait_object> as #imports::WorldQuery>::Fetch<'__w>;
             type State = #my_crate::TraitQueryState<#trait_object>;
 
@@ -285,13 +311,6 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
                 )
             }
 
-            #[inline]
-            fn shrink<'wlong: 'wshort, 'wshort>(
-                item: Self::Item<'wlong>,
-            ) -> Self::Item<'wshort> {
-                item
-            }
-
             const IS_DENSE: bool = <#my_crate::All<&mut #trait_object> as #imports::WorldQuery>::IS_DENSE;
 
             #[inline]
@@ -315,19 +334,6 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
                 <#my_crate::All<&mut #trait_object> as #imports::WorldQuery>::set_table(fetch, state, table);
             }
 
-            #[inline]
-            unsafe fn fetch<'w>(
-                fetch: &mut Self::Fetch<'w>,
-                entity: #imports::Entity,
-                table_row: #imports::TableRow,
-            ) -> Self::Item<'w> {
-                <#my_crate::All<&mut #trait_object> as #imports::WorldQuery>::fetch(
-                    fetch,
-                    entity,
-                    table_row,
-                )
-            }
-
             #[inline]
             fn update_component_access(
                 state: &Self::State,