Remove 's lifetime from WorldQuery::Fetch
#19720
Merged
Conversation
This file contains hidden or 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
chescock
added
A-ECS
alice-i-cecile
approved these changes
Jun 18, 2025
Victoronz
approved these changes
Jun 18, 2025
Victoronz
added
S-Ready-For-Final-Review
ecoskey
approved these changes
Jun 18, 2025
release-content/migration-guides/query_items_borrow_from_query_state.md
Outdated
Show resolved
Hide resolved
Co-authored-by: Emerson Coskey <[email protected]>
Trashtalk217
pushed a commit
to Trashtalk217/bevy
that referenced
this pull request
Jul 10, 2025
# Objective Unblock bevyengine#18162. bevyengine#15396 added the `'s` lifetime to `QueryData::Item` to make it possible for query items to borrow from the state. The state isn't passed directly to `QueryData::fetch()`, so it also added the `'s` lifetime to `WorldQuery::Fetch` so that we can pass the borrows through there. Unfortunately, having `WorldQuery::Fetch` borrow from the state makes it impossible to have owned state, because we store the state and the `Fetch` in the same `struct` during iteration. ## Solution Undo the change to add the `'s` lifetime to `WorldQuery::Fetch`. Instead, add a `&'s Self::State` parameter to `QueryData::fetch()` and `QueryFilter::filter_fetch()` so that borrows from the state can be passed directly to query items. --------- Co-authored-by: Alice Cecile <[email protected]> Co-authored-by: Emerson Coskey <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
Unblock #18162.
#15396 added the
'slifetime toQueryData::Itemto make it possible for query items to borrow from the state. The state isn't passed directly toQueryData::fetch(), so it also added the'slifetime toWorldQuery::Fetchso that we can pass the borrows through there.Unfortunately, having
WorldQuery::Fetchborrow from the state makes it impossible to have owned state, because we store the state and theFetchin the samestructduring iteration.Solution
Undo the change to add the
'slifetime toWorldQuery::Fetch.Instead, add a
&'s Self::Stateparameter toQueryData::fetch()andQueryFilter::filter_fetch()so that borrows from the state can be passed directly to query items.