-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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.
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
Fix name conflicts caused by the SystemParam
and WorldQuery
macros
#8012
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
7a40865
add a regression test
JoJoJet 0bf2c7f
fix the regression test
JoJoJet 7ad905c
ensure state types don't collide for `SystemParam`
JoJoJet accbab9
tweak regression test
JoJoJet df47636
add a dedicated method for generating identifiers with no collision
JoJoJet 952781f
add a regression test for queries
JoJoJet 47b21b9
prevent collisions for `WorldQuery` state and fetch types
JoJoJet 81fce59
add a comment describing the collision algorithm
JoJoJet 9df6846
remove a redundant import
JoJoJet 99f1883
use a more efficient collision checking algorithm
JoJoJet c1de12f
move `ensure_no_collision` to `bevy_macro_utils`
JoJoJet 53cb5d7
move a struct definition
JoJoJet 7827e79
use a hash set
JoJoJet 9289bb2
factor out a regression test into a named test
JoJoJet cd5e92f
capitalize regression test comments
JoJoJet fbae65f
don't use recursion to visit token trees
JoJoJet 04ab144
use FxHash
JoJoJet 96a1d61
Merge remote-tracking branch 'upstream/main' into state-name-conflict
JoJoJet 3801ddc
Merge remote-tracking branch 'upstream/main' into state-name-conflict
JoJoJet dca0f0c
Merge remote-tracking branch 'upstream/main' into state-name-conflict
JoJoJet cf8e525
Merge remote-tracking branch 'upstream/main' into state-name-conflict
JoJoJet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,3 +12,4 @@ keywords = ["bevy"] | |
toml_edit = "0.19" | ||
syn = "1.0" | ||
quote = "1.0" | ||
rustc-hash = "1.0" |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I love that this is reusable :D