 0256dacba4
			
		
	
	
		0256dacba4
		
			
		
	
	
	
	
		
			
			# Objective - Fix some doc warnings - Add doc-scrape-examples to all examples Moved from #12692 I run `cargo +nightly doc --workspace --all-features --no-deps -Zunstable-options -Zrustdoc-scrape-examples` <details> ``` warning: public documentation for `GzAssetLoaderError` links to private item `GzAssetLoader` --> examples/asset/asset_decompression.rs:24:47 | 24 | /// Possible errors that can be produced by [`GzAssetLoader`] | ^^^^^^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` = note: `#[warn(rustdoc::private_intra_doc_links)]` on by default warning: `bevy` (example "asset_decompression") generated 1 warning warning: unresolved link to `shape::Quad` --> examples/2d/mesh2d.rs:3:15 | 3 | //! [`Quad`]: shape::Quad | ^^^^^^^^^^^ no item named `shape` in scope | = note: `#[warn(rustdoc::broken_intra_doc_links)]` on by default warning: `bevy` (example "mesh2d") generated 1 warning warning: unresolved link to `WorldQuery` --> examples/ecs/custom_query_param.rs:1:49 | 1 | //! This example illustrates the usage of the [`WorldQuery`] derive macro, which allows | ^^^^^^^^^^ no item named `WorldQuery` in scope | = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]` = note: `#[warn(rustdoc::broken_intra_doc_links)]` on by default warning: `bevy` (example "custom_query_param") generated 1 warning warning: unresolved link to `shape::Quad` --> examples/2d/mesh2d_vertex_color_texture.rs:4:15 | 4 | //! [`Quad`]: shape::Quad | ^^^^^^^^^^^ no item named `shape` in scope | = note: `#[warn(rustdoc::broken_intra_doc_links)]` on by default warning: `bevy` (example "mesh2d_vertex_color_texture") generated 1 warning warning: public documentation for `TextPlugin` links to private item `CoolText` --> examples/asset/processing/asset_processing.rs:48:9 | 48 | /// * [`CoolText`]: a custom RON text format that supports dependencies and embedded dependencies | ^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` = note: `#[warn(rustdoc::private_intra_doc_links)]` on by default warning: public documentation for `TextPlugin` links to private item `Text` --> examples/asset/processing/asset_processing.rs:49:9 | 49 | /// * [`Text`]: a "normal" plain text file | ^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` warning: public documentation for `TextPlugin` links to private item `CoolText` --> examples/asset/processing/asset_processing.rs:51:57 | 51 | /// It also defines an asset processor that will load [`CoolText`], resolve embedded dependenc... | ^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` warning: `bevy` (example "asset_processing") generated 3 warnings warning: public documentation for `CustomAssetLoaderError` links to private item `CustomAssetLoader` --> examples/asset/custom_asset.rs:20:47 | 20 | /// Possible errors that can be produced by [`CustomAssetLoader`] | ^^^^^^^^^^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` = note: `#[warn(rustdoc::private_intra_doc_links)]` on by default warning: public documentation for `BlobAssetLoaderError` links to private item `CustomAssetLoader` --> examples/asset/custom_asset.rs:61:47 | 61 | /// Possible errors that can be produced by [`CustomAssetLoader`] | ^^^^^^^^^^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` ``` ``` warning: `bevy` (example "mesh2d") generated 1 warning warning: public documentation for `log_layers_ecs` links to private item `update_subscriber` --> examples/app/log_layers_ecs.rs:6:18 | 6 | //! Inside the [`update_subscriber`] function we will create a [`mpsc::Sender`] and a [`mpsc::R... | ^^^^^^^^^^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` = note: `#[warn(rustdoc::private_intra_doc_links)]` on by default warning: unresolved link to `AdvancedLayer` --> examples/app/log_layers_ecs.rs:7:72 | 7 | ... will go into the [`AdvancedLayer`] and the [`Receiver`](mpsc::Receiver) will | ^^^^^^^^^^^^^ no item named `AdvancedLayer` in scope | = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]` = note: `#[warn(rustdoc::broken_intra_doc_links)]` on by default warning: unresolved link to `LogEvents` --> examples/app/log_layers_ecs.rs:8:42 | 8 | //! go into a non-send resource called [`LogEvents`] (It has to be non-send because [`Receiver`... | ^^^^^^^^^ no item named `LogEvents` in scope | = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]` warning: public documentation for `log_layers_ecs` links to private item `transfer_log_events` --> examples/app/log_layers_ecs.rs:9:30 | 9 | //! From there we will use [`transfer_log_events`] to transfer log events from [`LogEvents`] to... | ^^^^^^^^^^^^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` warning: unresolved link to `LogEvents` --> examples/app/log_layers_ecs.rs:9:82 | 9 | ...nsfer log events from [`LogEvents`] to an ECS event called [`LogEvent`]. | ^^^^^^^^^ no item named `LogEvents` in scope | = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]` warning: public documentation for `log_layers_ecs` links to private item `LogEvent` --> examples/app/log_layers_ecs.rs:9:119 | 9 | ...nts`] to an ECS event called [`LogEvent`]. | ^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` warning: public documentation for `log_layers_ecs` links to private item `LogEvent` --> examples/app/log_layers_ecs.rs:11:49 | 11 | //! Finally, after all that we can access the [`LogEvent`] event from our systems and use it. | ^^^^^^^^ this item is private | = note: this link will resolve properly if you pass `--document-private-items` ``` <details/>
		
			
				
	
	
		
			195 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			195 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! This example illustrates the usage of the [`QueryData`] 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 [`QueryData`] derive macro, see the trait documentation.
 | |
| 
 | |
| use bevy::{
 | |
|     ecs::query::{QueryData, QueryFilter},
 | |
|     prelude::*,
 | |
| };
 | |
| use std::fmt::Debug;
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_systems(Startup, spawn)
 | |
|         .add_systems(
 | |
|             Update,
 | |
|             (
 | |
|                 print_components_read_only,
 | |
|                 print_components_iter_mut,
 | |
|                 print_components_iter,
 | |
|                 print_components_tuple,
 | |
|             )
 | |
|                 .chain(),
 | |
|         )
 | |
|         .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(QueryData)]
 | |
| #[query_data(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>,
 | |
|         CustomQueryFilter<ComponentC, ComponentD>,
 | |
|     >,
 | |
| ) {
 | |
|     println!("Print components (read_only):");
 | |
|     for e in &query {
 | |
|         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 [`QueryData`] 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(QueryData)]
 | |
| #[query_data(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(QueryData)]
 | |
| #[query_data(derive(Debug))]
 | |
| struct EmptyQuery {
 | |
|     empty: (),
 | |
| }
 | |
| 
 | |
| #[derive(QueryData)]
 | |
| #[query_data(derive(Debug))]
 | |
| struct NestedQuery {
 | |
|     c: &'static ComponentC,
 | |
|     d: Option<&'static ComponentD>,
 | |
| }
 | |
| 
 | |
| #[derive(QueryData)]
 | |
| #[query_data(derive(Debug))]
 | |
| struct GenericQuery<T: Component, P: Component> {
 | |
|     generic: (&'static T, &'static P),
 | |
| }
 | |
| 
 | |
| #[derive(QueryFilter)]
 | |
| struct CustomQueryFilter<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((ComponentA, ComponentB, ComponentC, ComponentD));
 | |
| }
 | |
| 
 | |
| fn print_components_iter_mut(
 | |
|     mut query: Query<
 | |
|         CustomQuery<ComponentC, ComponentD>,
 | |
|         CustomQueryFilter<ComponentC, ComponentD>,
 | |
|     >,
 | |
| ) {
 | |
|     println!("Print components (iter_mut):");
 | |
|     for e in &mut query {
 | |
|         // 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>, CustomQueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (iter):");
 | |
|     for e in &query {
 | |
|         // 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 {
 | |
|         println!("Entity: {entity:?}");
 | |
|         println!("A: {a:?}");
 | |
|         println!("B: {b:?}");
 | |
|         println!("Nested: {:?} {:?}", nested.0, nested.1);
 | |
|         println!("Generic: {generic_c:?} {generic_d:?}");
 | |
|     }
 | |
| }
 |