Deprecate DeferredWorld::query by generalizing QueryState::query_mut - #25789
Merged
Merged
Conversation
…tate::query_mut`. Deprecate `DeferredWorld::query()`.
SkiFire13
approved these changes
Sep 14, 2026
ItsDoot
reviewed
Sep 14, 2026
ItsDoot
reviewed
Sep 14, 2026
alice-i-cecile
approved these changes
Sep 15, 2026
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
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
Make the API for querying using
QueryStatemore consistent.Currently, the way to get a
Queryfrom aQueryStateandWorldis theQueryState::queryandQueryState::query_mutmethods, but the way to get aQueryfromQueryStateandDeferredWorldis theDeferredWorld::querymethod.This is also surprising because
DeferredWorldderefs toWorld, and there is aWorld::querymethod that creates aQueryStateinstead of creating aQuery.Solution
Generalize
QueryState::query_mutto takeimpl Into<DeferredWorld<'w'>>. Add a missingFromimpl so that this actually works with&mut DeferredWorld, and addDeferredWorld::to_unsafe_world_cellto recover the full'wlifetime in the implementation.Deprecate
DeferredWorld::queryin favor ofQueryState::query_mut.