Clarify a confusing green-path function#153175
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Feb 28, 2026
Merged
Conversation
rustbot
added
A-query-system
Collaborator
|
r? @madsmtm rustbot has assigned @madsmtm. Use Why was this reviewer chosen?The reviewer was selected based on:
|
petrochenkov
approved these changes
Feb 27, 2026
Contributor
|
r? petrochenkov |
Contributor
|
r=me with or without renaming. |
rustbot
added
S-waiting-on-author
Zalathar
changed the title
load_or_invoke_greenload_from_disk_or_invoke_provider_green
Zalathar
changed the title
load_from_disk_or_invoke_provider_green
Member
Author
|
@bors r=petrochenkov |
Contributor
rust-bors
bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 27, 2026
Clarify a confusing green-path function The current name of this function, `try_load_from_disk_and_cache_in_memory`, is confusing on a number of levels: - Trying to mark the node green is load-bearing even for queries that never cache to disk. - It will only return None if it fails to mark the query green; the subsequent parts always return Some. - If it cannot load a value from disk, it will obtain a value by invoking the query provider. - It is not actually responsible for storing values in the in-memory cache; that is handled by an outer layer. This PR therefore: - Hoists the try-mark-green out of that function, making the function always return a value. - Renames the function to `load_from_disk_or_invoke_provider_green `. - Renames a few other local variables in passing. There should be no change to compiler behaviour.
This was referenced Feb 27, 2026
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 27, 2026
…uwer Rollup of 12 pull requests Successful merges: - #151143 (explicit tail calls: support indirect arguments) - #153012 (Stop using `LinkedGraph` in `lexical_region_resolve`) - #153175 (Clarify a confusing green-path function) - #153179 (Force a CI LLVM stamp bump) - #150828 (Improved security section in rustdoc for `current_exe`) - #152673 (rustc_public: rewrite `bridge_impl` to reduce boilerplate) - #152674 (rustc_public: remove the `CrateDefItems` trait) - #153073 (Fix mem::conjure_zst panic message to use any::type_name instead) - #153117 (Remove mutation from macro path URL construction) - #153128 (Recover feature lang_items for emscripten) - #153138 (Print path root when printing path) - #153159 (Work around a false `err.emit();` type error in rust-analyzer)
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 27, 2026
…uwer Rollup of 12 pull requests Successful merges: - #151143 (explicit tail calls: support indirect arguments) - #153012 (Stop using `LinkedGraph` in `lexical_region_resolve`) - #153175 (Clarify a confusing green-path function) - #153179 (Force a CI LLVM stamp bump) - #150828 (Improved security section in rustdoc for `current_exe`) - #152673 (rustc_public: rewrite `bridge_impl` to reduce boilerplate) - #152674 (rustc_public: remove the `CrateDefItems` trait) - #153073 (Fix mem::conjure_zst panic message to use any::type_name instead) - #153117 (Remove mutation from macro path URL construction) - #153128 (Recover feature lang_items for emscripten) - #153138 (Print path root when printing path) - #153159 (Work around a false `err.emit();` type error in rust-analyzer)
rust-timer
added a commit
that referenced
this pull request
Feb 28, 2026
Rollup merge of #153175 - Zalathar:load-green, r=petrochenkov Clarify a confusing green-path function The current name of this function, `try_load_from_disk_and_cache_in_memory`, is confusing on a number of levels: - Trying to mark the node green is load-bearing even for queries that never cache to disk. - It will only return None if it fails to mark the query green; the subsequent parts always return Some. - If it cannot load a value from disk, it will obtain a value by invoking the query provider. - It is not actually responsible for storing values in the in-memory cache; that is handled by an outer layer. This PR therefore: - Hoists the try-mark-green out of that function, making the function always return a value. - Renames the function to `load_from_disk_or_invoke_provider_green `. - Renames a few other local variables in passing. There should be no change to compiler behaviour.
makai410
pushed a commit
to makai410/rustc_public
that referenced
this pull request
Mar 19, 2026
…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#151143 (explicit tail calls: support indirect arguments) - rust-lang/rust#153012 (Stop using `LinkedGraph` in `lexical_region_resolve`) - rust-lang/rust#153175 (Clarify a confusing green-path function) - rust-lang/rust#153179 (Force a CI LLVM stamp bump) - rust-lang/rust#150828 (Improved security section in rustdoc for `current_exe`) - rust-lang/rust#152673 (rustc_public: rewrite `bridge_impl` to reduce boilerplate) - rust-lang/rust#152674 (rustc_public: remove the `CrateDefItems` trait) - rust-lang/rust#153073 (Fix mem::conjure_zst panic message to use any::type_name instead) - rust-lang/rust#153117 (Remove mutation from macro path URL construction) - rust-lang/rust#153128 (Recover feature lang_items for emscripten) - rust-lang/rust#153138 (Print path root when printing path) - rust-lang/rust#153159 (Work around a false `err.emit();` type error in rust-analyzer)
makai410
pushed a commit
to makai410/rustc_public
that referenced
this pull request
Mar 19, 2026
…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#151143 (explicit tail calls: support indirect arguments) - rust-lang/rust#153012 (Stop using `LinkedGraph` in `lexical_region_resolve`) - rust-lang/rust#153175 (Clarify a confusing green-path function) - rust-lang/rust#153179 (Force a CI LLVM stamp bump) - rust-lang/rust#150828 (Improved security section in rustdoc for `current_exe`) - rust-lang/rust#152673 (rustc_public: rewrite `bridge_impl` to reduce boilerplate) - rust-lang/rust#152674 (rustc_public: remove the `CrateDefItems` trait) - rust-lang/rust#153073 (Fix mem::conjure_zst panic message to use any::type_name instead) - rust-lang/rust#153117 (Remove mutation from macro path URL construction) - rust-lang/rust#153128 (Recover feature lang_items for emscripten) - rust-lang/rust#153138 (Print path root when printing path) - rust-lang/rust#153159 (Work around a false `err.emit();` type error in rust-analyzer)
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
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.
The current name of this function,
try_load_from_disk_and_cache_in_memory, is confusing on a number of levels:This PR therefore:
load_from_disk_or_invoke_provider_green.There should be no change to compiler behaviour.