Collect active query jobs into struct `QueryJobMap`#152514

Zalathar · 2026-02-12T04:24:32Z

This PR encapsulates the existing QueryMap type alias into a proper struct named QueryJobMap, which is used by code that wants to inspect the full set of currently-active query jobs.

Wrapping the query job map in a struct makes it easier to see how other code interacts with the map, and also lets us change some free functions for map lookup into methods.

We also do a renaming pass to consistently refer to the query job map as job_map, or as job_map_out in the places where it's a mutable out-parameter.

There should be no change to compiler behaviour.

r? nnethercote (or compiler)

nnethercote · 2026-02-12T05:32:13Z

compiler/rustc_query_impl/src/job.rs

-    let query_map = match qcx.collect_active_jobs_from_all_queries(false) {
-        Ok(query_map) => query_map,
-        Err(query_map) => query_map,
-    };


Result<T, T> is always a weird type...

ControlFlow actually has a method for this (https://doc.rust-lang.org/stable/std/ops/enum.ControlFlow.html#method.into_value), but Result does not.

nnethercote · 2026-02-12T05:32:59Z

compiler/rustc_query_impl/src/plumbing.rs

+            ) -> Option<()>
        ] = &[
-            $(query_impl::$name::gather_active_jobs),*
+            $( $crate::query_impl::$name::gather_active_jobs ),*


Does crate work?

The macro is only ever expanded in its own crate, so $crate and crate both work and happen to mean the same thing.

When both styles are possible, I usually prefer $crate to reassure the reader that the definition can be found in the same crate as the macro, whereas crate in a macro is unusual and asks the reader to consider the possibility of it referring to a different crate from the macro.

(An argument could be made that crate is the more “logically correct” choice, because query_impl is declared by the macro at its expansion site, but since both crates are the same in practice I think the reassuring “same crate” signal is more helpful.)

nnethercote · 2026-02-12T05:33:37Z

compiler/rustc_query_impl/src/job.rs

-    map: &'a QueryMap<'tcx>,
-) -> Option<&'a QueryLatch<'tcx>> {
-    map.get(&id).unwrap().job.latch.as_ref()
+    fn frame_of(&self, id: QueryJobId) -> &QueryStackFrame<QueryStackDeferred<'tcx>> {


These query_job_id_* functions were a clumsy leftover from one of my earlier PRs. This is a nice tidying up.

Yeah, I believe they were inherent methods of QueryJobId at the time.

nnethercote · 2026-02-12T05:33:56Z

r=me after the comments are considered.

petrochenkov · 2026-02-12T10:21:31Z

compiler/rustc_query_impl/src/job.rs

-) -> Option<&'a QueryLatch<'tcx>> {
-    map.get(&id).unwrap().job.latch.as_ref()
+    fn frame_of(&self, id: QueryJobId) -> &QueryStackFrame<QueryStackDeferred<'tcx>> {
+        &self.map.get(&id).unwrap().frame


Suggested change

&self.map.get(&id).unwrap().frame

&self.map[&id].frame

?

And in other cases too.

I've adjusted the occurrences in inherent methods.

There's more in find_cycle_in_stack and find_dep_kind_root.

I was less sure about what to do with those. They're in the same file, so I guess job_map.map[&id] would be fine.

Huh, TIL you can use [] to infallibly access a hashmap.

rustbot · 2026-02-12T14:02:59Z

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.

nnethercote · 2026-02-12T22:24:58Z

@bors r+

rust-bors · 2026-02-12T22:25:02Z

📌 Commit b9b28ba has been approved by nnethercote

It is now in the queue for this repository.

Collect active query jobs into struct `QueryJobMap` This PR encapsulates the existing `QueryMap` type alias into a proper struct named `QueryJobMap`, which is used by code that wants to inspect the full set of currently-active query jobs. Wrapping the query job map in a struct makes it easier to see how other code interacts with the map, and also lets us change some free functions for map lookup into methods. We also do a renaming pass to consistently refer to the query job map as `job_map`, or as `job_map_out` in the places where it's a mutable out-parameter. There should be no change to compiler behaviour. r? nnethercote (or compiler)

Rollup of 18 pull requests Successful merges: - #150551 (Compute localized outlives constraints lazily) - #150752 (Update libc to v0.2.181) - #150988 (Improve code suggestion for incorrect macro_rules! usage) - #152422 (Change query proc macro to be more rust-analyzer friendly) - #152496 (Fix multi-cgu+debug builds using autodiff by delaying autodiff till lto) - #152514 (Collect active query jobs into struct `QueryJobMap`) - #152520 (Don't use `DepContext` in `rustc_middle::traits::cache`) - #152528 (Support serializing CodegenContext) - #152082 (Move tests) - #152232 (Add must_use for FileTimes) - #152329 (Simplify parallel! macro) - #152444 (`-Znext-solver` Prevent committing unfulfilled unsized coercion) - #152486 (remove redundant backchain attribute in codegen) - #152519 (Fix feature gating for new `try bikeshed` expressions) - #152529 (sparc64: enable abi compatibility test) - #152548 (reject inline const patterns pre-expansion) - #152550 (Port #[prelude_import] to the attribute parser) - #152552 (Add 2048-bit HvxVectorPair support to Hexagon SIMD ABI checks)

Rollup of 17 pull requests Successful merges: - #150551 (Compute localized outlives constraints lazily) - #150988 (Improve code suggestion for incorrect macro_rules! usage) - #152422 (Change query proc macro to be more rust-analyzer friendly) - #152496 (Fix multi-cgu+debug builds using autodiff by delaying autodiff till lto) - #152514 (Collect active query jobs into struct `QueryJobMap`) - #152520 (Don't use `DepContext` in `rustc_middle::traits::cache`) - #152528 (Support serializing CodegenContext) - #152082 (Move tests) - #152232 (Add must_use for FileTimes) - #152329 (Simplify parallel! macro) - #152444 (`-Znext-solver` Prevent committing unfulfilled unsized coercion) - #152486 (remove redundant backchain attribute in codegen) - #152519 (Fix feature gating for new `try bikeshed` expressions) - #152529 (sparc64: enable abi compatibility test) - #152548 (reject inline const patterns pre-expansion) - #152550 (Port #[prelude_import] to the attribute parser) - #152552 (Add 2048-bit HvxVectorPair support to Hexagon SIMD ABI checks) Failed merges: - #152515 (Extract `DepKindVTable` constructors to their own module)

Rollup merge of #152514 - Zalathar:job-map, r=nnethercote Collect active query jobs into struct `QueryJobMap` This PR encapsulates the existing `QueryMap` type alias into a proper struct named `QueryJobMap`, which is used by code that wants to inspect the full set of currently-active query jobs. Wrapping the query job map in a struct makes it easier to see how other code interacts with the map, and also lets us change some free functions for map lookup into methods. We also do a renaming pass to consistently refer to the query job map as `job_map`, or as `job_map_out` in the places where it's a mutable out-parameter. There should be no change to compiler behaviour. r? nnethercote (or compiler)

rustbot assigned nnethercote Feb 12, 2026

nnethercote approved these changes Feb 12, 2026

View reviewed changes

petrochenkov reviewed Feb 12, 2026

View reviewed changes

Zalathar force-pushed the job-map branch from 98343ca to 0363e65 Compare February 12, 2026 14:02

Zalathar force-pushed the job-map branch from 0363e65 to 693a5ac Compare February 12, 2026 14:07

Collect active query jobs into struct QueryJobMap

b9b28ba

Zalathar force-pushed the job-map branch from 693a5ac to b9b28ba Compare February 12, 2026 14:18

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 12, 2026

Zalathar mentioned this pull request Feb 13, 2026

Rollup of 18 pull requests #152560

Closed

Zalathar mentioned this pull request Feb 13, 2026

Rollup of 17 pull requests #152562

Merged

rust-bors bot merged commit 504bc66 into rust-lang:main Feb 13, 2026
11 checks passed

Zalathar deleted the job-map branch February 13, 2026 12:18

cuviper added this to the 1.95.0 milestone Feb 19, 2026

Uh oh!

Conversation

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

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nnethercote commented Feb 12, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Feb 12, 2026

Uh oh!

nnethercote commented Feb 12, 2026

Uh oh!

rust-bors bot commented Feb 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Zalathar commented Feb 12, 2026 •

edited

Loading