Make WorldQuery meta types unnameable
#7964
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alice-i-cecile
added
A-ECS
alice-i-cecile
approved these changes
Mar 8, 2023
james7132
approved these changes
Mar 8, 2023
james7132
added
the
S-Ready-For-Final-Review
Shfty
pushed a commit
to shfty-rust/bevy
that referenced
this pull request
Mar 19, 2023
Shfty
pushed a commit
to shfty-rust/bevy
that referenced
this pull request
Mar 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Objective
The
WorldQueryderive macro can generate three hidden types:QueryState,QueryFetch, andQueryReadOnlyFetch. These are only#[doc(hidden)]though, and are still publicly accessible and can potentially conflict with user-defined types.Fixes #6264.
Solution
Move the definitions of these types into an anonymous scope, so that are unnamable outside of the derive macro. The
QueryItemandQueryReadOnlyItemstructs are still nameable, as they are a part of the public API for world query structs.Changelog
Internal types generated by the
WorldQueryderive macro are now unnameable.Migration Guide
The
StateandFetchtypes for types created using#[derive(WorldQuery)]are now unnameable. If you need to refer to them, use the syntax<T as WorldQuery>::State,<T as WorldQuery>::Fetch.