Remove 's
lifetime from WorldQuery::Fetch
#19720
Merged
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
's
lifetime toQueryData::Item
to make it possible for query items to borrow from the state. The state isn't passed directly toQueryData::fetch()
, so it also added the's
lifetime toWorldQuery::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 theFetch
in the samestruct
during iteration.Solution
Undo the change to add the
's
lifetime toWorldQuery::Fetch
.Instead, add a
&'s Self::State
parameter toQueryData::fetch()
andQueryFilter::filter_fetch()
so that borrows from the state can be passed directly to query items.