Update dependencies (#43)

* Update Bevy's commit hash to the latest on main.
* Update to syn 2.0.
* Update to criterion 0.5.

Cargo.toml

@@ -16,11 +16,11 @@ bevy-trait-query-impl = { path = "proc-macro", version = "0.2" }
 
 [dependencies.bevy]
 git = "https://github.com/bevyengine/bevy"
-rev = "21e1893c4f39bfd33967145810479d56b03486ce"
+rev = "aeeb20ec4c43db07c2690ce926169ed9d6550d93"
 default-features = false
 
 [dev-dependencies]
-criterion = "0.4"
+criterion = "0.5"
 
 [[bench]]
 name = "concrete"

proc-macro/Cargo.toml

@@ -16,6 +16,6 @@ proc-macro = true
 
 [dependencies]
 proc-macro2 = "1"
-syn = { version = "1", features = ["full"] }
+syn = { version = "2", features = ["full"] }
 quote = "1"
 proc-macro-crate = "1"

proc-macro/src/lib.rs

@@ -162,7 +162,7 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
 
             #[inline]
             unsafe fn init_fetch<'w>(
-                world: &'w #imports::World,
+                world: #imports::UnsafeWorldCell<'w>,
                 state: &Self::State,
                 last_run: #imports::Tick,
                 this_run: #imports::Tick,
@@ -270,7 +270,7 @@ fn impl_trait_query(arg: TokenStream, item: TokenStream) -> Result<TokenStream2>
 
             #[inline]
             unsafe fn init_fetch<'w>(
-                world: &'w #imports::World,
+                world: #imports::UnsafeWorldCell<'w>,
                 state: &Self::State,
                 last_run: #imports::Tick,
                 this_run: #imports::Tick,

src/all.rs

@@ -1,11 +1,13 @@
 use crate::{
-    debug_unreachable, zip_exact, TraitImplMeta, TraitImplRegistry, TraitQuery, TraitQueryState,
+    debug_unreachable, trait_registry_error, zip_exact, TraitImplMeta, TraitImplRegistry,
+    TraitQuery, TraitQueryState,
 };
 use bevy::ecs::change_detection::Mut;
 use bevy::ecs::component::{ComponentId, Tick};
 use bevy::ecs::entity::Entity;
 use bevy::ecs::query::{QueryItem, ReadOnlyWorldQuery, WorldQuery};
 use bevy::ecs::storage::{SparseSets, Table, TableRow};
+use bevy::ecs::world::unsafe_world_cell::UnsafeWorldCell;
 use bevy::ecs::world::World;
 use bevy::ptr::UnsafeCellDeref;
 
@@ -391,13 +393,15 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a Trait> {
 
     #[inline]
     unsafe fn init_fetch<'w>(
-        world: &'w World,
+        world: UnsafeWorldCell<'w>,
         _state: &Self::State,
         _last_run: Tick,
         _this_run: Tick,
     ) -> ReadAllTraitsFetch<'w, Trait> {
         ReadAllTraitsFetch {
-            registry: world.resource(),
+            registry: world
+                .get_resource()
+                .unwrap_or_else(|| trait_registry_error()),
             table: None,
             sparse_sets: &world.storages().sparse_sets,
         }
@@ -506,13 +510,15 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a mut Trait> {
 
     #[inline]
     unsafe fn init_fetch<'w>(
-        world: &'w World,
+        world: UnsafeWorldCell<'w>,
         _state: &Self::State,
         last_run: Tick,
         this_run: Tick,
     ) -> WriteAllTraitsFetch<'w, Trait> {
         WriteAllTraitsFetch {
-            registry: world.resource(),
+            registry: world
+                .get_resource()
+                .unwrap_or_else(|| trait_registry_error()),
             table: None,
             sparse_sets: &world.storages().sparse_sets,
             last_run,

src/lib.rs

@@ -96,7 +96,7 @@
 //! # fn show_tooltips() {}
 //! #
 //! # fn main() {
-//! #     App::new().add_plugins(DefaultPlugins).add_plugin(TooltipPlugin).update();
+//! #     App::new().add_plugins((DefaultPlugins, TooltipPlugin)).update();
 //! # }
 //! ```
 //!
@@ -359,7 +359,7 @@ pub mod imports {
             Access, Added, Changed, FilteredAccess, QueryItem, ReadOnlyWorldQuery, WorldQuery,
         },
         storage::{Table, TableRow},
-        world::World,
+        world::{unsafe_world_cell::UnsafeWorldCell, World},
     };
 }
 
@@ -473,3 +473,9 @@ unsafe fn debug_unreachable() -> ! {
     #[cfg(not(debug_assertions))]
     std::hint::unreachable_unchecked();
 }
+
+#[inline(never)]
+#[cold]
+fn trait_registry_error() -> ! {
+    panic!("The trait query registry has not been initialized; did you forget to register your traits with the world?")
+}

src/one.rs

@@ -4,6 +4,7 @@ use bevy::ecs::component::{ComponentId, ComponentTicks, Tick};
 use bevy::ecs::entity::Entity;
 use bevy::ecs::query::{QueryItem, ReadOnlyWorldQuery, WorldQuery};
 use bevy::ecs::storage::{ComponentSparseSet, SparseSets, TableRow};
+use bevy::ecs::world::unsafe_world_cell::UnsafeWorldCell;
 use bevy::ecs::world::World;
 use bevy::ptr::{Ptr, ThinSlicePtr, UnsafeCellDeref};
 use std::cell::UnsafeCell;
@@ -93,7 +94,7 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for One<&'a Trait> {
 
     #[inline]
     unsafe fn init_fetch<'w>(
-        world: &'w World,
+        world: UnsafeWorldCell<'w>,
         _state: &Self::State,
         _last_run: Tick,
         _this_run: Tick,
@@ -262,7 +263,7 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for One<&'a mut Trait> {
 
     #[inline]
     unsafe fn init_fetch<'w>(
-        world: &'w World,
+        world: UnsafeWorldCell<'w>,
         _state: &Self::State,
         last_run: Tick,
         this_run: Tick,