Allow usage outside of the Bevy engine (ECS-only scenarios) (#48)

This should allow for people who wish to use `bevy_ecs` outside of the Bevy ecosystem to take advantage of this crate without pulling in dependencies that aren't necessary for their projects. 

The `bevy` feature is active by default so current users should be unaffected when upgrading, using this in an ECS-only scenario simply requires disabling default features.

```toml
[dependencies.bevy-trait-query]
default-features = false
```

Great crate by the way, has been extremely useful for a hobby project of mine so far!👍

Author: csh

.github/workflows/ci.yml

@@ -30,7 +30,9 @@ jobs:
           toolchain: stable
       - name: Install alsa and udev
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
-      - name: Run tests
+      - name: Run tests with minimal features
+        run: cargo test --lib --no-default-features
+      - name: "Run tests with default features"
         run: cargo test
 
   clippy:

Cargo.toml

@@ -11,17 +11,35 @@ categories = ["game-development"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = ["bevy_app", "bevy_core"]
+
 [dependencies]
 bevy-trait-query-impl = { path = "proc-macro", version = "0.4.0-dev" }
+tracing = "0.1"
 
-[dependencies.bevy]
+[dependencies.bevy_ecs]
 git = "https://github.com/bevyengine/bevy"
 rev = "060711669903306c59eaea427498948992f0e768"
-default-features = false
+
+[dependencies.bevy_app]
+git = "https://github.com/bevyengine/bevy"
+rev = "060711669903306c59eaea427498948992f0e768"
+optional = true
+
+[dependencies.bevy_core]
+git = "https://github.com/bevyengine/bevy"
+rev = "060711669903306c59eaea427498948992f0e768"
+optional = true
 
 [dev-dependencies]
 criterion = "0.5"
 
+[dev-dependencies.bevy]
+git = "https://github.com/bevyengine/bevy"
+rev = "060711669903306c59eaea427498948992f0e768"
+default-features = false
+
 [[bench]]
 name = "concrete"
 harness = false

benches/all.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::all)]
 
-use bevy::prelude::*;
+use bevy_core::Name;
+use bevy_ecs::prelude::*;
 use bevy_trait_query::*;
 use criterion::*;
 use std::fmt::Display;
@@ -58,7 +59,7 @@ impl<'w> Benchmark<'w> {
         }
 
         let query = world.query();
-        Self(world, query, default())
+        Self(world, query, Default::default())
     }
     fn multiple() -> Self {
         let mut world = World::new();
@@ -75,7 +76,7 @@ impl<'w> Benchmark<'w> {
         }
 
         let query = world.query();
-        Self(world, query, default())
+        Self(world, query, Default::default())
     }
     // Queries with only one, and queries with multiple.
     pub fn distributed() -> Self {
@@ -99,7 +100,7 @@ impl<'w> Benchmark<'w> {
         }
 
         let query = world.query();
-        Self(world, query, default())
+        Self(world, query, Default::default())
     }
 
     pub fn run(&mut self) {

benches/concrete.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::all)]
 
-use bevy::prelude::*;
+use bevy_core::Name;
+use bevy_ecs::prelude::*;
 use bevy_trait_query::*;
 use criterion::*;
 use std::fmt::Display;
@@ -52,7 +53,7 @@ impl<'w> Benchmark<'w> {
         }
 
         let query = world.query();
-        Self(world, query, default())
+        Self(world, query, Default::default())
     }
     fn multiple() -> Self {
         let mut world = World::new();
@@ -66,7 +67,7 @@ impl<'w> Benchmark<'w> {
         }
 
         let query = world.query();
-        Self(world, query, default())
+        Self(world, query, Default::default())
     }
 
     pub fn run(&mut self) {

benches/fragmented.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::all)]
 
-use bevy::prelude::*;
+use bevy_ecs::prelude::*;
 use bevy_trait_query::*;
 use criterion::*;
 use std::fmt::Display;

benches/one.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::all)]
 
-use bevy::prelude::*;
+use bevy_core::Name;
+use bevy_ecs::prelude::*;
 use bevy_trait_query::*;
 use criterion::*;
 use std::fmt::Display;
@@ -58,7 +59,7 @@ impl<'w> Benchmark<'w> {
         }
 
         let query = world.query();
-        Self(world, query, default())
+        Self(world, query, Default::default())
     }
     // There will be some entities that have multiple trait impls, and will be filtered out.
     pub fn filtered() -> Self {
@@ -82,7 +83,7 @@ impl<'w> Benchmark<'w> {
         }
 
         let query = world.query();
-        Self(world, query, default())
+        Self(world, query, Default::default())
     }
 
     pub fn run(&mut self) {

src/all.rs

@@ -1,12 +1,12 @@
-use bevy::ecs::{
+use bevy_ecs::{
     change_detection::{DetectChanges, Mut, Ref},
     component::{ComponentId, Tick},
     entity::Entity,
+    ptr::UnsafeCellDeref,
     query::{QueryItem, ReadOnlyWorldQuery, WorldQuery},
     storage::{SparseSets, Table, TableRow},
     world::{unsafe_world_cell::UnsafeWorldCell, World},
 };
-use bevy::ptr::UnsafeCellDeref;
 
 use crate::{
     debug_unreachable, trait_registry_error, zip_exact, TraitImplMeta, TraitImplRegistry,
@@ -484,16 +484,16 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a Trait> {
     unsafe fn set_archetype<'w>(
         fetch: &mut Self::Fetch<'w>,
         _state: &Self::State,
-        _archetype: &'w bevy::ecs::archetype::Archetype,
-        table: &'w bevy::ecs::storage::Table,
+        _archetype: &'w bevy_ecs::archetype::Archetype,
+        table: &'w bevy_ecs::storage::Table,
     ) {
         fetch.table = Some(table);
     }
 
     unsafe fn set_table<'w>(
         fetch: &mut Self::Fetch<'w>,
         _state: &Self::State,
-        table: &'w bevy::ecs::storage::Table,
+        table: &'w bevy_ecs::storage::Table,
     ) {
         fetch.table = Some(table);
     }
@@ -519,7 +519,7 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a Trait> {
     #[inline]
     fn update_component_access(
         state: &Self::State,
-        access: &mut bevy::ecs::query::FilteredAccess<ComponentId>,
+        access: &mut bevy_ecs::query::FilteredAccess<ComponentId>,
     ) {
         for &component in &*state.components {
             assert!(
@@ -534,8 +534,8 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a Trait> {
     #[inline]
     fn update_archetype_component_access(
         state: &Self::State,
-        archetype: &bevy::ecs::archetype::Archetype,
-        access: &mut bevy::ecs::query::Access<bevy::ecs::archetype::ArchetypeComponentId>,
+        archetype: &bevy_ecs::archetype::Archetype,
+        access: &mut bevy_ecs::query::Access<bevy_ecs::archetype::ArchetypeComponentId>,
     ) {
         for &component in &*state.components {
             if let Some(archetype_component_id) = archetype.get_archetype_component_id(component) {
@@ -596,8 +596,8 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a mut Trait> {
     unsafe fn set_archetype<'w>(
         fetch: &mut Self::Fetch<'w>,
         _state: &Self::State,
-        _archetype: &'w bevy::ecs::archetype::Archetype,
-        table: &'w bevy::ecs::storage::Table,
+        _archetype: &'w bevy_ecs::archetype::Archetype,
+        table: &'w bevy_ecs::storage::Table,
     ) {
         fetch.table = Some(table);
     }
@@ -606,7 +606,7 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a mut Trait> {
     unsafe fn set_table<'w>(
         fetch: &mut Self::Fetch<'w>,
         _state: &Self::State,
-        table: &'w bevy::ecs::storage::Table,
+        table: &'w bevy_ecs::storage::Table,
     ) {
         fetch.table = Some(table);
     }
@@ -632,7 +632,7 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a mut Trait> {
     #[inline]
     fn update_component_access(
         state: &Self::State,
-        access: &mut bevy::ecs::query::FilteredAccess<ComponentId>,
+        access: &mut bevy_ecs::query::FilteredAccess<ComponentId>,
     ) {
         for &component in &*state.components {
             assert!(
@@ -647,8 +647,8 @@ unsafe impl<'a, Trait: ?Sized + TraitQuery> WorldQuery for All<&'a mut Trait> {
     #[inline]
     fn update_archetype_component_access(
         state: &Self::State,
-        archetype: &bevy::ecs::archetype::Archetype,
-        access: &mut bevy::ecs::query::Access<bevy::ecs::archetype::ArchetypeComponentId>,
+        archetype: &bevy_ecs::archetype::Archetype,
+        access: &mut bevy_ecs::query::Access<bevy_ecs::archetype::ArchetypeComponentId>,
     ) {
         for &component in &*state.components {
             if let Some(archetype_component_id) = archetype.get_archetype_component_id(component) {

src/lib.rs

@@ -31,7 +31,7 @@
 //! ) {
 //!     // ...
 //! }
-//! # bevy::ecs::system::assert_is_system(show_tooltips_system);
+//! # bevy_ecs::system::assert_is_system(show_tooltips_system);
 //! ```
 //!
 //! Since Rust unfortunately lacks any kind of reflection, it is necessary to register each
@@ -186,7 +186,7 @@
 //!         println!("Tooltip: {}", tooltip.tooltip());
 //!     }
 //! }
-//! # bevy::ecs::system::assert_is_system(show_tooltips);
+//! # bevy_ecs::system::assert_is_system(show_tooltips);
 //! ```
 //!
 //! Trait queries support basic change detection filtration. So to get all the components that
@@ -252,12 +252,9 @@
 //! | 1-2 matches       | -              | 16.959 µs         | 82.179 µs       |
 //!
 
-use bevy::{
-    ecs::{
-        component::{ComponentId, StorageType},
-        world::World,
-    },
-    prelude::*,
+use bevy_ecs::{
+    component::{ComponentId, ComponentStorage, StorageType},
+    prelude::{Component, Resource, World},
     ptr::{Ptr, PtrMut},
 };
 
@@ -303,7 +300,7 @@ impl RegisterExt for World {
     {
         let component_id = self.init_component::<C>();
         let registry = self
-            .get_resource_or_insert_with::<TraitImplRegistry<Trait>>(default)
+            .get_resource_or_insert_with::<TraitImplRegistry<Trait>>(Default::default)
             .into_inner();
         let meta = TraitImplMeta {
             size_bytes: std::mem::size_of::<C>(),
@@ -314,7 +311,8 @@ impl RegisterExt for World {
     }
 }
 
-impl RegisterExt for App {
+#[cfg(feature = "bevy_app")]
+impl RegisterExt for bevy_app::App {
     fn register_component_as<Trait: ?Sized + TraitQuery, C: Component>(&mut self) -> &mut Self
     where
         (C,): TraitQueryMarker<Trait, Covered = C>,
@@ -370,7 +368,6 @@ impl<Trait: ?Sized + TraitQuery> TraitImplRegistry<Trait> {
         self.components.push(component);
         self.meta.push(meta);
 
-        use bevy::ecs::component::ComponentStorage;
         match <C as Component>::Storage::STORAGE_TYPE {
             StorageType::Table => {
                 self.table_components.push(component);
@@ -403,7 +400,7 @@ impl<T: ?Sized> Clone for TraitImplMeta<T> {
 
 #[doc(hidden)]
 pub mod imports {
-    pub use bevy::ecs::{
+    pub use bevy_ecs::{
         archetype::{Archetype, ArchetypeComponentId},
         component::Tick,
         component::{Component, ComponentId},
@@ -426,7 +423,7 @@ impl<Trait: ?Sized + TraitQuery> TraitQueryState<Trait> {
     fn init(world: &mut World) -> Self {
         #[cold]
         fn missing_registry<T: ?Sized + 'static>() -> TraitImplRegistry<T> {
-            warn!(
+            tracing::warn!(
                 "no components found matching `{}`, did you forget to register them?",
                 std::any::type_name::<T>()
             );