Rename collect_active_jobs to several distinct names#151976
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Feb 3, 2026
Merged
Rename collect_active_jobs to several distinct names#151976rust-bors[bot] merged 1 commit intorust-lang:mainfrom
collect_active_jobs to several distinct names#151976rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
Merged
Member
Author
|
rustbot
added
the
S-blocked
Zalathar
added
T-compiler
This comment has been minimized.
This comment has been minimized.
Zalathar
force-pushed
the
collect-active-jobs
branch
from
9fe0dee to
177809b
Compare
Zalathar
changed the title
collect_active_jobs)collect_active_jobs to several distinct names
Member
Author
|
I decided to remove some of the other renames from this PR, and focus primarily on |
petrochenkov
reviewed
Feb 2, 2026
| /// Internal per-query plumbing for collecting the set of active jobs for this query. | ||
| /// | ||
| /// Should only be called through `PER_QUERY_GATHER_ACTIVE_JOBS_FNS`. | ||
| pub(crate) fn gather_active_jobs_outer<'tcx>( |
Contributor
There was a problem hiding this comment.
Suggested change
| pub(crate) fn gather_active_jobs_outer<'tcx>( | |
| pub(crate) fn gather_active_jobs<'tcx>( |
"Outer" seems like a bit of an overkill, given that gather_active_jobs_inner and this function already have different names.
Contributor
There was a problem hiding this comment.
Sure, removing the _outer seems fine.
Member
Author
There was a problem hiding this comment.
For me it was a close call between gather_active_jobs and gather_active_jobs_outer.
I slightly prefer _outer because the two parts are so distant, but I'm happy with both, so I'll go with reviewer preference and change it to gather_active_jobs.
nnethercote
approved these changes
Feb 2, 2026
Contributor
|
This is great! I have been annoyed by these names myself, thanks for fixing them. r=me with the |
Zalathar
force-pushed
the
collect-active-jobs
branch
from
177809b to
dea5507
Compare
This comment has been minimized.
This comment has been minimized.
Zalathar
force-pushed
the
collect-active-jobs
branch
from
dea5507 to
f95f05f
Compare
Member
Author
Contributor
|
📋 This PR cannot be approved because it currently has the following label: |
Member
Author
|
Oh yes, even the reduced version of this PR will still need a rebase for #151978. |
This comment has been minimized.
This comment has been minimized.
Zalathar
force-pushed
the
collect-active-jobs
branch
from
f95f05f to
a0a5c41
Compare
This comment has been minimized.
This comment has been minimized.
Member
Author
|
Rebased, but this will also need another rebase over #151975, which is currently in rollup. |
This comment has been minimized.
This comment has been minimized.
Zalathar
force-pushed
the
collect-active-jobs
branch
from
a0a5c41 to
e58538c
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Member
Author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
Member
Author
|
@bors r=nnethercote |
Contributor
rust-bors
bot
added
S-waiting-on-bors
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Feb 3, 2026
…ethercote Rename `collect_active_jobs` to several distinct names Key renames: - Function `collect_active_jobs` → `collect_active_jobs_from_all_queries` (method in trait `QueryContext`) - Constant `COLLECT_ACTIVE_JOBS` → `PER_QUERY_GATHER_ACTIVE_JOBS_FNS` (list of per-query function pointers) - Function `collect_active_jobs` → `gather_active_jobs` (per-query function in `query_impl::$name`) - Function `collect_active_jobs` → `gather_active_jobs_inner` (method in `QueryState`) - Giving these four things distinct names makes it a lot easier to tell them apart! - The switch from “collect” (all queries) to “gather” (single query) is intended to make the different parts a bit more memorable and searchable; I couldn't think of a more natural way to express this distinction so I settled for two different synonyms. There should be no change to compiler behaviour. r? nnethercote (or compiler)
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 3, 2026
Rollup of 6 pull requests Successful merges: - #152008 (`rust-analyzer` subtree update) - #151109 (fN::BITS constants for feature float_bits_const) - #151976 (Rename `collect_active_jobs` to several distinct names) - #151691 (compiletest: Don't assume `aux-crate` becomes a `*.so` with `no-prefer-dynamic`) - #151919 (fix: Make `--color always` always print color with `--explain`) - #152028 (Convert to inline diagnostics in `rustc_driver_impl`)
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 3, 2026
Rollup of 7 pull requests Successful merges: - #152008 (`rust-analyzer` subtree update) - #151109 (fN::BITS constants for feature float_bits_const) - #151976 (Rename `collect_active_jobs` to several distinct names) - #151691 (compiletest: Don't assume `aux-crate` becomes a `*.so` with `no-prefer-dynamic`) - #151919 (fix: Make `--color always` always print color with `--explain`) - #152017 (Remove `with_no_trimmed_paths` use in query macro) - #152028 (Convert to inline diagnostics in `rustc_driver_impl`)
rust-timer
added a commit
that referenced
this pull request
Feb 3, 2026
Rollup merge of #151976 - Zalathar:collect-active-jobs, r=nnethercote Rename `collect_active_jobs` to several distinct names Key renames: - Function `collect_active_jobs` → `collect_active_jobs_from_all_queries` (method in trait `QueryContext`) - Constant `COLLECT_ACTIVE_JOBS` → `PER_QUERY_GATHER_ACTIVE_JOBS_FNS` (list of per-query function pointers) - Function `collect_active_jobs` → `gather_active_jobs` (per-query function in `query_impl::$name`) - Function `collect_active_jobs` → `gather_active_jobs_inner` (method in `QueryState`) - Giving these four things distinct names makes it a lot easier to tell them apart! - The switch from “collect” (all queries) to “gather” (single query) is intended to make the different parts a bit more memorable and searchable; I couldn't think of a more natural way to express this distinction so I settled for two different synonyms. There should be no change to compiler behaviour. r? nnethercote (or compiler)
github-actions bot
pushed a commit
to rust-lang/compiler-builtins
that referenced
this pull request
Feb 3, 2026
Rollup of 7 pull requests Successful merges: - rust-lang/rust#152008 (`rust-analyzer` subtree update) - rust-lang/rust#151109 (fN::BITS constants for feature float_bits_const) - rust-lang/rust#151976 (Rename `collect_active_jobs` to several distinct names) - rust-lang/rust#151691 (compiletest: Don't assume `aux-crate` becomes a `*.so` with `no-prefer-dynamic`) - rust-lang/rust#151919 (fix: Make `--color always` always print color with `--explain`) - rust-lang/rust#152017 (Remove `with_no_trimmed_paths` use in query macro) - rust-lang/rust#152028 (Convert to inline diagnostics in `rustc_driver_impl`)
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Feb 4, 2026
Rollup of 7 pull requests Successful merges: - rust-lang/rust#152008 (`rust-analyzer` subtree update) - rust-lang/rust#151109 (fN::BITS constants for feature float_bits_const) - rust-lang/rust#151976 (Rename `collect_active_jobs` to several distinct names) - rust-lang/rust#151691 (compiletest: Don't assume `aux-crate` becomes a `*.so` with `no-prefer-dynamic`) - rust-lang/rust#151919 (fix: Make `--color always` always print color with `--explain`) - rust-lang/rust#152017 (Remove `with_no_trimmed_paths` use in query macro) - rust-lang/rust#152028 (Convert to inline diagnostics in `rustc_driver_impl`)
github-actions bot
pushed a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Feb 5, 2026
Rollup of 7 pull requests Successful merges: - rust-lang/rust#152008 (`rust-analyzer` subtree update) - rust-lang/rust#151109 (fN::BITS constants for feature float_bits_const) - rust-lang/rust#151976 (Rename `collect_active_jobs` to several distinct names) - rust-lang/rust#151691 (compiletest: Don't assume `aux-crate` becomes a `*.so` with `no-prefer-dynamic`) - rust-lang/rust#151919 (fix: Make `--color always` always print color with `--explain`) - rust-lang/rust#152017 (Remove `with_no_trimmed_paths` use in query macro) - rust-lang/rust#152028 (Convert to inline diagnostics in `rustc_driver_impl`)
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
5 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.
Key renames:
collect_active_jobs→collect_active_jobs_from_all_queries(method in traitQueryContext)COLLECT_ACTIVE_JOBS→PER_QUERY_GATHER_ACTIVE_JOBS_FNS(list of per-query function pointers)collect_active_jobs→gather_active_jobs(per-query function inquery_impl::$name)collect_active_jobs→gather_active_jobs_inner(method inQueryState)There should be no change to compiler behaviour.
r? nnethercote (or compiler)