Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - WorldQuery derive macro now respects visibility #4125

Closed
wants to merge 3 commits into from
Closed

[Merged by Bors] - WorldQuery derive macro now respects visibility #4125

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea623da
WorldQuery derive macro now respects visibility
ItsDoot Mar 6, 2022
728730a
Add #[doc(hidden)] to generated structs
ItsDoot Apr 1, 2022
fc7e97a
Update crates/bevy_ecs/macros/src/fetch.rs
cart Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions crates/bevy_ecs/macros/src/fetch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ mod field_attr_keywords {
pub static WORLD_QUERY_ATTRIBUTE_NAME: &str = "world_query";

pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
let visibility = ast.vis;

let mut fetch_struct_attributes = FetchStructAttributes::default();
for attr in &ast.attrs {
if !attr
Expand Down Expand Up @@ -233,7 +235,8 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
item_struct_name: Ident| {
if is_filter {
quote! {
struct #fetch_struct_name #impl_generics #where_clause {
#[doc(hidden)]
#visibility struct #fetch_struct_name #impl_generics #where_clause {
#(#field_idents: <#field_types as #path::query::WorldQuery>::#fetch_associated_type,)*
#(#ignored_field_idents: #ignored_field_types,)*
}
Expand Down Expand Up @@ -276,13 +279,15 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
}
} else {
quote! {
#[doc(hidden)]
cart marked this conversation as resolved.
Show resolved Hide resolved
#derive_macro_call
struct #item_struct_name #impl_generics #where_clause {
#visibility struct #item_struct_name #impl_generics #where_clause {
#(#(#field_attrs)* #field_visibilities #field_idents: <<#field_types as #path::query::WorldQuery>::#fetch_associated_type as #path::query::Fetch<#world_lifetime, #world_lifetime>>::Item,)*
#(#(#ignored_field_attrs)* #ignored_field_visibilities #ignored_field_idents: #ignored_field_types,)*
}

struct #fetch_struct_name #impl_generics #where_clause {
#[doc(hidden)]
#visibility struct #fetch_struct_name #impl_generics #where_clause {
#(#field_idents: <#field_types as #path::query::WorldQuery>::#fetch_associated_type,)*
#(#ignored_field_idents: #ignored_field_types,)*
}
Expand Down Expand Up @@ -342,7 +347,8 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
);

let state_impl = quote! {
struct #state_struct_name #impl_generics #where_clause {
#[doc(hidden)]
#visibility struct #state_struct_name #impl_generics #where_clause {
#(#field_idents: <#field_types as #path::query::WorldQuery>::State,)*
#(#ignored_field_idents: #ignored_field_types,)*
}
Expand Down