Remove #[derive(Resource, Component)]
from tests
#21589
Merged
+96
−83
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
Multiple tests derive both
Resource
andComponent
on a single struct. In the current resources-for-components plan (#19731), this leads to a conflict.Solution
Becomes
and the tests are changed accordingly.
There was one test that had to be removed as it specifically tested that a query could both query a resource and a component with the same name. That test doesn't make any sense anymore, so I removed it.
Testing
I tested the changes by adding code into
Resource
derive macro, that also derivesComponent
, so any conflicts showed up by runningcargo build
.Future work
AmbientLight
inbevy_light
still derives both, but since that requires a little more work, I'm saving it for later.