Rename `collect_active_jobs` to several distinct names #151976

Zalathar · 2026-02-02T03:33:29Z

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)

Zalathar · 2026-02-02T03:59:14Z

This will conflict with some of the more modest renames in Query cleanups #151978.

@rustbot blocked on #151978

Zalathar · 2026-02-02T06:00:16Z

I decided to remove some of the other renames from this PR, and focus primarily on collect_active_jobs.

petrochenkov · 2026-02-02T16:20:03Z

compiler/rustc_query_impl/src/plumbing.rs

+            /// 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>(


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.

Sure, removing the _outer seems fine.

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 · 2026-02-02T22:52:50Z

This is great! I have been annoyed by these names myself, thanks for fixing them. r=me with the _outer removed.

Zalathar · 2026-02-03T00:23:29Z

Changed gather_active_jobs_outer to gather_active_jobs (per feedback), and also tweaked spacing/comments to more clearly indicate where the real work happens (diff).

@bors r=nnethercote

rust-bors · 2026-02-03T00:23:32Z

📋 This PR cannot be approved because it currently has the following label: S-blocked.

Zalathar · 2026-02-03T00:30:08Z

Oh yes, even the reduced version of this PR will still need a rebase for #151978.

Zalathar · 2026-02-03T05:16:00Z

Rebased, but this will also need another rebase over #151975, which is currently in rollup.

rustbot · 2026-02-03T09:12:26Z

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.

Zalathar · 2026-02-03T09:12:42Z

@rustbot ready

Zalathar · 2026-02-03T09:12:53Z

@bors r=nnethercote

rust-bors · 2026-02-03T09:12:56Z

📌 Commit e58538c has been approved by nnethercote

It is now in the queue for this repository.

…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)

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`)

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`)

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)

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`)

Zalathar mentioned this pull request Feb 2, 2026

Query cleanups #151978

Merged

rustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Feb 2, 2026

Zalathar added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) labels Feb 2, 2026

This comment has been minimized.

Sign in to view

Zalathar force-pushed the collect-active-jobs branch from 9fe0dee to 177809b Compare February 2, 2026 05:59

Zalathar changed the title ~~Rename several parts of active-query-job collection (collect_active_jobs)~~ Rename collect_active_jobs to several distinct names Feb 2, 2026

petrochenkov reviewed Feb 2, 2026

View reviewed changes

nnethercote approved these changes Feb 2, 2026

View reviewed changes

Zalathar force-pushed the collect-active-jobs branch from 177809b to dea5507 Compare February 3, 2026 00:19

This comment has been minimized.

Sign in to view

Zalathar force-pushed the collect-active-jobs branch from dea5507 to f95f05f Compare February 3, 2026 00:21

This comment has been minimized.

Sign in to view

Zalathar force-pushed the collect-active-jobs branch from f95f05f to a0a5c41 Compare February 3, 2026 05:14

This comment has been minimized.

Sign in to view

Rename collect_active_jobs to several distinct names

e58538c

Zalathar force-pushed the collect-active-jobs branch from a0a5c41 to e58538c Compare February 3, 2026 09:12

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 3, 2026

rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 3, 2026

jhpratt mentioned this pull request Feb 3, 2026

Rollup of 6 pull requests #152032

Closed

Zalathar mentioned this pull request Feb 3, 2026

Rollup of 7 pull requests #152035

Merged

rust-bors bot merged commit f69082d into rust-lang:main Feb 3, 2026
11 checks passed

rustbot added this to the 1.95.0 milestone Feb 3, 2026

Zalathar deleted the collect-active-jobs branch February 3, 2026 22:20

	pub(crate) fn gather_active_jobs_outer<'tcx>(
	pub(crate) fn gather_active_jobs<'tcx>(

Uh oh!

Rename collect_active_jobs to several distinct names #151976

Rename collect_active_jobs to several distinct names #151976

Conversation

Zalathar commented Feb 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zalathar commented Feb 2, 2026

Uh oh!

This comment has been minimized.

Zalathar commented Feb 2, 2026

Uh oh!

petrochenkov Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

nnethercote Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Zalathar Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

nnethercote commented Feb 2, 2026

Uh oh!

This comment has been minimized.

Zalathar commented Feb 3, 2026

Uh oh!

rust-bors bot commented Feb 3, 2026

Uh oh!

Zalathar commented Feb 3, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Zalathar commented Feb 3, 2026

Uh oh!

This comment has been minimized.

rustbot commented Feb 3, 2026

Uh oh!

Zalathar commented Feb 3, 2026

Uh oh!

Zalathar commented Feb 3, 2026

Uh oh!

rust-bors bot commented Feb 3, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Rename `collect_active_jobs` to several distinct names #151976

Rename `collect_active_jobs` to several distinct names #151976

Zalathar commented Feb 2, 2026 •

edited

Loading