 73c78c3667
			
		
	
	
		73c78c3667
		
	
	
	
	
		
			
			# Objective
`bevy_ecs` has large amounts of unsafe code which is hard to get right and makes it difficult to audit for soundness.
## Solution
Introduce lifetimed, type-erased pointers: `Ptr<'a>` `PtrMut<'a>` `OwningPtr<'a>'` and `ThinSlicePtr<'a, T>` which are newtypes around a raw pointer with a lifetime and conceptually representing strong invariants about the pointee and validity of the pointer.
The process of converting bevy_ecs to use these has already caught multiple cases of unsound behavior.
## Changelog
TL;DR for release notes: `bevy_ecs` now uses lifetimed, type-erased pointers internally, significantly improving safety and legibility without sacrificing performance. This should have approximately no end user impact, unless you were meddling with the (unfortunately public) internals of `bevy_ecs`.
- `Fetch`, `FilterFetch` and `ReadOnlyFetch` trait no longer have a `'state` lifetime
    - this was unneeded
- `ReadOnly/Fetch` associated types on `WorldQuery` are now on a new `WorldQueryGats<'world>` trait
    - was required to work around lack of Generic Associated Types (we wish to express `type Fetch<'a>: Fetch<'a>`)
- `derive(WorldQuery)` no longer requires `'w` lifetime on struct
    - this was unneeded, and improves the end user experience
- `EntityMut::get_unchecked_mut` returns `&'_ mut T` not `&'w mut T`
    - allows easier use of unsafe API with less footguns, and can be worked around via lifetime transmutery as a user
- `Bundle::from_components` now takes a `ctx` parameter to pass to the `FnMut` closure
    - required because closure return types can't borrow from captures
- `Fetch::init` takes `&'world World`, `Fetch::set_archetype` takes `&'world Archetype` and `&'world Tables`, `Fetch::set_table` takes `&'world Table`
    - allows types implementing `Fetch` to store borrows into world
- `WorldQuery` trait now has a `shrink` fn to shorten the lifetime in `Fetch::<'a>::Item`
    - this works around lack of subtyping of assoc types, rust doesnt allow you to turn `<T as Fetch<'static>>::Item'` into `<T as Fetch<'a>>::Item'`
    - `QueryCombinationsIter` requires this
- Most types implementing `Fetch` now have a lifetime `'w`
    - allows the fetches to store borrows of world data instead of using raw pointers
## Migration guide
- `EntityMut::get_unchecked_mut` returns a more restricted lifetime, there is no general way to migrate this as it depends on your code
- `Bundle::from_components` implementations must pass the `ctx` arg to `func`
- `Bundle::from_components` callers have to use a fn arg instead of closure captures for borrowing from world
- Remove lifetime args on `derive(WorldQuery)` structs as it is nonsensical
- `<Q as WorldQuery>::ReadOnly/Fetch` should be changed to either `RO/QueryFetch<'world>` or `<Q as WorldQueryGats<'world>>::ReadOnly/Fetch`
- `<F as Fetch<'w, 's>>` should be changed to `<F as Fetch<'w>>`
- Change the fn sigs of `Fetch::init/set_archetype/set_table` to match respective trait fn sigs
- Implement the required `fn shrink` on any `WorldQuery` implementations
- Move assoc types `Fetch` and `ReadOnlyFetch` on `WorldQuery` impls to `WorldQueryGats` impls
- Pass an appropriate `'world` lifetime to whatever fetch struct you are for some reason using
### Type inference regression
in some cases rustc may give spurrious errors when attempting to infer the `F` parameter on a query/querystate this can be fixed by manually specifying the type, i.e. `QueryState:🆕:<_, ()>(world)`. The error is rather confusing:
```rust=
error[E0271]: type mismatch resolving `<() as Fetch<'_>>::Item == bool`
    --> crates/bevy_pbr/src/render/light.rs:1413:30
     |
1413 |             main_view_query: QueryState::new(world),
     |                              ^^^^^^^^^^^^^^^ expected `bool`, found `()`
     |
     = note: required because of the requirements on the impl of `for<'x> FilterFetch<'x>` for `<() as WorldQueryGats<'x>>::Fetch`
note: required by a bound in `bevy_ecs::query::QueryState::<Q, F>::new`
    --> crates/bevy_ecs/src/query/state.rs:49:32
     |
49   |     for<'x> QueryFetch<'x, F>: FilterFetch<'x>,
     |                                ^^^^^^^^^^^^^^^ required by this bound in `bevy_ecs::query::QueryState::<Q, F>::new`
```
---
Made with help from @BoxyUwU and @alice-i-cecile 
Co-authored-by: Boxy <supbscripter@gmail.com>
		
	
			
		
			
				
	
	
		
			187 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			187 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use bevy::{
 | |
|     ecs::{component::Component, query::WorldQuery},
 | |
|     prelude::*,
 | |
| };
 | |
| use std::fmt::Debug;
 | |
| 
 | |
| /// This examples illustrates the usage of the `WorldQuery` derive macro, which allows
 | |
| /// defining custom query and filter types.
 | |
| ///
 | |
| /// While regular tuple queries work great in most of simple scenarios, using custom queries
 | |
| /// declared as named structs can bring the following advantages:
 | |
| /// - They help to avoid destructuring or using `q.0, q.1, ...` access pattern.
 | |
| /// - Adding, removing components or changing items order with structs greatly reduces maintenance
 | |
| ///   burden, as you don't need to update statements that destructure tuples, care about order
 | |
| ///   of elements, etc. Instead, you can just add or remove places where a certain element is used.
 | |
| /// - Named structs enable the composition pattern, that makes query types easier to re-use.
 | |
| /// - You can bypass the limit of 15 components that exists for query tuples.
 | |
| ///
 | |
| /// For more details on the `WorldQuery` derive macro, see the trait documentation.
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_startup_system(spawn)
 | |
|         .add_system(print_components_read_only)
 | |
|         .add_system(print_components_iter_mut.after(print_components_read_only))
 | |
|         .add_system(print_components_iter.after(print_components_iter_mut))
 | |
|         .add_system(print_components_tuple.after(print_components_iter))
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentA;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentB;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentC;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentD;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentZ;
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct ReadOnlyCustomQuery<T: Component + Debug, P: Component + Debug> {
 | |
|     entity: Entity,
 | |
|     a: &'static ComponentA,
 | |
|     b: Option<&'static ComponentB>,
 | |
|     nested: NestedQuery,
 | |
|     optional_nested: Option<NestedQuery>,
 | |
|     optional_tuple: Option<(&'static ComponentB, &'static ComponentZ)>,
 | |
|     generic: GenericQuery<T, P>,
 | |
|     empty: EmptyQuery,
 | |
| }
 | |
| 
 | |
| fn print_components_read_only(
 | |
|     query: Query<ReadOnlyCustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (read_only):");
 | |
|     for e in query.iter() {
 | |
|         println!("Entity: {:?}", e.entity);
 | |
|         println!("A: {:?}", e.a);
 | |
|         println!("B: {:?}", e.b);
 | |
|         println!("Nested: {:?}", e.nested);
 | |
|         println!("Optional nested: {:?}", e.optional_nested);
 | |
|         println!("Optional tuple: {:?}", e.optional_tuple);
 | |
|         println!("Generic: {:?}", e.generic);
 | |
|     }
 | |
|     println!();
 | |
| }
 | |
| 
 | |
| // If you are going to mutate the data in a query, you must mark it with the `mutable` attribute.
 | |
| // The `WorldQuery` derive macro will still create a read-only version, which will be have `ReadOnly`
 | |
| // suffix.
 | |
| // Note: if you want to use derive macros with read-only query variants, you need to pass them with
 | |
| // using the `derive` attribute.
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(mutable, derive(Debug))]
 | |
| struct CustomQuery<T: Component + Debug, P: Component + Debug> {
 | |
|     entity: Entity,
 | |
|     a: &'static mut ComponentA,
 | |
|     b: Option<&'static mut ComponentB>,
 | |
|     nested: NestedQuery,
 | |
|     optional_nested: Option<NestedQuery>,
 | |
|     optional_tuple: Option<(NestedQuery, &'static mut ComponentZ)>,
 | |
|     generic: GenericQuery<T, P>,
 | |
|     empty: EmptyQuery,
 | |
| }
 | |
| 
 | |
| // This is a valid query as well, which would iterate over every entity.
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct EmptyQuery {
 | |
|     empty: (),
 | |
| }
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct NestedQuery {
 | |
|     c: &'static ComponentC,
 | |
|     d: Option<&'static ComponentD>,
 | |
| }
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct GenericQuery<T: Component, P: Component> {
 | |
|     generic: (&'static T, &'static P),
 | |
| }
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| struct QueryFilter<T: Component, P: Component> {
 | |
|     _c: With<ComponentC>,
 | |
|     _d: With<ComponentD>,
 | |
|     _or: Or<(Added<ComponentC>, Changed<ComponentD>, Without<ComponentZ>)>,
 | |
|     _generic_tuple: (With<T>, With<P>),
 | |
| }
 | |
| 
 | |
| fn spawn(mut commands: Commands) {
 | |
|     commands
 | |
|         .spawn()
 | |
|         .insert(ComponentA)
 | |
|         .insert(ComponentB)
 | |
|         .insert(ComponentC)
 | |
|         .insert(ComponentD);
 | |
| }
 | |
| 
 | |
| fn print_components_iter_mut(
 | |
|     mut query: Query<CustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (iter_mut):");
 | |
|     for e in query.iter_mut() {
 | |
|         // Re-declaring the variable to illustrate the type of the actual iterator item.
 | |
|         let e: CustomQueryItem<'_, _, _> = e;
 | |
|         println!("Entity: {:?}", e.entity);
 | |
|         println!("A: {:?}", e.a);
 | |
|         println!("B: {:?}", e.b);
 | |
|         println!("Optional nested: {:?}", e.optional_nested);
 | |
|         println!("Optional tuple: {:?}", e.optional_tuple);
 | |
|         println!("Nested: {:?}", e.nested);
 | |
|         println!("Generic: {:?}", e.generic);
 | |
|     }
 | |
|     println!();
 | |
| }
 | |
| 
 | |
| fn print_components_iter(
 | |
|     query: Query<CustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (iter):");
 | |
|     for e in query.iter() {
 | |
|         // Re-declaring the variable to illustrate the type of the actual iterator item.
 | |
|         let e: CustomQueryReadOnlyItem<'_, _, _> = e;
 | |
|         println!("Entity: {:?}", e.entity);
 | |
|         println!("A: {:?}", e.a);
 | |
|         println!("B: {:?}", e.b);
 | |
|         println!("Nested: {:?}", e.nested);
 | |
|         println!("Generic: {:?}", e.generic);
 | |
|     }
 | |
|     println!();
 | |
| }
 | |
| 
 | |
| type NestedTupleQuery<'w> = (&'w ComponentC, &'w ComponentD);
 | |
| type GenericTupleQuery<'w, T, P> = (&'w T, &'w P);
 | |
| 
 | |
| fn print_components_tuple(
 | |
|     query: Query<
 | |
|         (
 | |
|             Entity,
 | |
|             &ComponentA,
 | |
|             &ComponentB,
 | |
|             NestedTupleQuery,
 | |
|             GenericTupleQuery<ComponentC, ComponentD>,
 | |
|         ),
 | |
|         (
 | |
|             With<ComponentC>,
 | |
|             With<ComponentD>,
 | |
|             Or<(Added<ComponentC>, Changed<ComponentD>, Without<ComponentZ>)>,
 | |
|         ),
 | |
|     >,
 | |
| ) {
 | |
|     println!("Print components (tuple):");
 | |
|     for (entity, a, b, nested, (generic_c, generic_d)) in query.iter() {
 | |
|         println!("Entity: {:?}", entity);
 | |
|         println!("A: {:?}", a);
 | |
|         println!("B: {:?}", b);
 | |
|         println!("Nested: {:?} {:?}", nested.0, nested.1);
 | |
|         println!("Generic: {:?} {:?}", generic_c, generic_d);
 | |
|     }
 | |
| }
 |