Use closures more consistently in `dep_graph.rs`. by nnethercote · Pull Request #153997 · rust-lang/rust

nnethercote · 2026-03-17T11:00:51Z

This file has several methods that take a FnOnce() -> R closure:

DepGraph::with_ignore
DepGraph::with_query_deserialization
DepGraph::with_anon_task
DepGraphData::with_anon_task_inner

It also has two methods that take a faux closure via an A argument and a fn(TyCtxt<'tcx>, A) -> R argument:

DepGraph::with_task
DepGraphData::with_task

The rationale is that the faux closure exercises tight control over what state they have access to. This seems silly when (a) they are passed a TyCtxt, and (b) when similar nearby functions take real closures. And they are more awkward to use, e.g. requiring multiple arguments to be gathered into a tuple. This commit changes the faux closures to real closures.

r? @Zalathar

rustbot · 2026-03-17T11:00:54Z

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

rustbot · 2026-03-17T11:00:56Z

Zalathar is not on the review rotation at the moment.
They may take a while to respond.

nnethercote · 2026-03-17T11:01:03Z

@bors try @rust-timer queue

Use closures more consistently in `dep_graph.rs`.

Zalathar · 2026-03-17T11:48:08Z

Based on comments, I think there was historically a desire to make sure that dep-graph tasks didn't accidentally pull in other untracked state via closure capture.

But given the existing inconsistency, and the fact that passing tcx gives access to the kitchen sink anyway, there probably isn't any harm in just using normal closures at this point.

rust-bors · 2026-03-17T13:10:36Z

☀️ Try build successful (CI)
Build commit: 283c322 (283c322d1c3e0fd24ba3187d32027674e634f7e5, parent: b711f95f86b6489b91fdc55c876ed5f95a8d4560)

rust-timer · 2026-03-17T13:58:20Z

Finished benchmarking commit (283c322): comparison URL.

Overall result: ❌ regressions - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.1%	[0.1%, 0.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -1.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.4%	[-1.5%, -1.3%]	2
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results (secondary -0.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.0%	[-0.0%, -0.0%]	1
All ❌✅ (primary)	-	-	0

Bootstrap: 481.409s -> 481.18s (-0.05%)
Artifact size: 394.91 MiB -> 396.71 MiB (0.45%)

This file has several methods that take a `FnOnce() -> R` closure: - `DepGraph::with_ignore` - `DepGraph::with_query_deserialization` - `DepGraph::with_anon_task` - `DepGraphData::with_anon_task_inner` It also has two methods that take a faux closure via an `A` argument and a `fn(TyCtxt<'tcx>, A) -> R` argument: - DepGraph::with_task - DepGraphData::with_task The rationale is that the faux closure exercises tight control over what state they have access to. This seems silly when (a) they are passed a `TyCtxt`, and (b) when similar nearby functions take real closures. And they are more awkward to use, e.g. requiring multiple arguments to be gathered into a tuple. This commit changes the faux closures to real closures.

rustbot · 2026-03-31T09:26:31Z

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-03-31T09:28:41Z

I have updated this, removing all the parts that changed existing closure type and variable names. I used op: OP for the with_task closures, which (a) matches the existing closures on nearby with_* methods, and (b) are names with more than one letter.

nnethercote · 2026-04-12T22:27:06Z

Zalathar has low review availability right now, so let's switch reviewers.

As per this comment:

I have updated this, removing all the parts that changed existing closure type and variable names. I used op: OP for the with_task closures, which (a) matches the existing closures on nearby with_* methods, and (b) are names with more than one letter.

This is now a reduced version of the original PR.

r? @petrochenkov

petrochenkov · 2026-04-13T10:19:18Z

@bors r+

rust-bors · 2026-04-13T10:19:22Z

📌 Commit deb901c has been approved by petrochenkov

It is now in the queue for this repository.

JonathanBrouwer · 2026-04-13T10:47:41Z

@bors rollup
Perf results are noise

@Zalathar

…=petrochenkov Use closures more consistently in `dep_graph.rs`. This file has several methods that take a `FnOnce() -> R` closure: - `DepGraph::with_ignore` - `DepGraph::with_query_deserialization` - `DepGraph::with_anon_task` - `DepGraphData::with_anon_task_inner` It also has two methods that take a faux closure via an `A` argument and a `fn(TyCtxt<'tcx>, A) -> R` argument: - DepGraph::with_task - DepGraphData::with_task The rationale is that the faux closure exercises tight control over what state they have access to. This seems silly when (a) they are passed a `TyCtxt`, and (b) when similar nearby functions take real closures. And they are more awkward to use, e.g. requiring multiple arguments to be gathered into a tuple. This commit changes the faux closures to real closures. r? @Zalathar

…uwer Rollup of 10 pull requests Successful merges: - #155227 (`rust-analyzer` subtree update) - #153335 (Add #![unstable_removed(..)] attribute to track removed features) - #154932 (Handle RTN projections in assoc type restriction diagnostics) - #155096 (delegation: support proper interaction of user-specified args and impl Traits) - #155106 (cg_llvm: scalable vectors with `simd_cast` and `simd_select`) - #155140 (add regression test for OpenOptionsExt downstream compat) - #155182 (Make the expansion of guard metavars begin guard non-terminals) - #155226 (delegation: revert execution of hir_crate_items before delayed lowering) - #153997 (Use closures more consistently in `dep_graph.rs`.) - #155003 (update thin-vec)

@Zalathar

Rollup merge of #153997 - nnethercote:closure-consistency, r=petrochenkov Use closures more consistently in `dep_graph.rs`. This file has several methods that take a `FnOnce() -> R` closure: - `DepGraph::with_ignore` - `DepGraph::with_query_deserialization` - `DepGraph::with_anon_task` - `DepGraphData::with_anon_task_inner` It also has two methods that take a faux closure via an `A` argument and a `fn(TyCtxt<'tcx>, A) -> R` argument: - DepGraph::with_task - DepGraphData::with_task The rationale is that the faux closure exercises tight control over what state they have access to. This seems silly when (a) they are passed a `TyCtxt`, and (b) when similar nearby functions take real closures. And they are more awkward to use, e.g. requiring multiple arguments to be gathered into a tuple. This commit changes the faux closures to real closures. r? @Zalathar

…uwer Rollup of 10 pull requests Successful merges: - rust-lang/rust#155227 (`rust-analyzer` subtree update) - rust-lang/rust#153335 (Add #![unstable_removed(..)] attribute to track removed features) - rust-lang/rust#154932 (Handle RTN projections in assoc type restriction diagnostics) - rust-lang/rust#155096 (delegation: support proper interaction of user-specified args and impl Traits) - rust-lang/rust#155106 (cg_llvm: scalable vectors with `simd_cast` and `simd_select`) - rust-lang/rust#155140 (add regression test for OpenOptionsExt downstream compat) - rust-lang/rust#155182 (Make the expansion of guard metavars begin guard non-terminals) - rust-lang/rust#155226 (delegation: revert execution of hir_crate_items before delayed lowering) - rust-lang/rust#153997 (Use closures more consistently in `dep_graph.rs`.) - rust-lang/rust#155003 (update thin-vec)

rustbot added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Mar 17, 2026

rustbot assigned Zalathar Mar 17, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Mar 17, 2026

Auto merge of #153997 - nnethercote:closure-consistency, r=<try>

283c322

Use closures more consistently in `dep_graph.rs`.

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 17, 2026

petrochenkov reviewed Mar 17, 2026

View reviewed changes

Comment thread compiler/rustc_middle/src/dep_graph/graph.rs Outdated

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 17, 2026

Zalathar reviewed Mar 18, 2026

View reviewed changes

Comment thread compiler/rustc_middle/src/dep_graph/graph.rs Outdated

Zalathar reviewed Mar 18, 2026

View reviewed changes

Comment thread compiler/rustc_middle/src/dep_graph/graph.rs Outdated

nnethercote force-pushed the closure-consistency branch from ba1d61e to b9f0815 Compare March 18, 2026 04:30

This comment has been minimized.

Sign in to view

nnethercote force-pushed the closure-consistency branch from b9f0815 to deb901c Compare March 31, 2026 09:26

rustbot assigned petrochenkov and unassigned Zalathar Apr 12, 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 Apr 13, 2026

This was referenced Apr 13, 2026

Rollup of 6 pull requests #155232

Closed

Rollup of 10 pull requests #155239

Merged

rust-bors Bot merged commit 2f607ee into rust-lang:main Apr 13, 2026
11 checks passed

rustbot added this to the 1.97.0 milestone Apr 13, 2026

nnethercote deleted the closure-consistency branch April 13, 2026 20:48

Uh oh!

Conversation

nnethercote commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 17, 2026

Uh oh!

rustbot commented Mar 17, 2026

Uh oh!

nnethercote commented Mar 17, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

Zalathar commented Mar 17, 2026

Uh oh!

rust-bors Bot commented Mar 17, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Mar 17, 2026

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

rustbot commented Mar 31, 2026

Uh oh!

nnethercote commented Mar 31, 2026

Uh oh!

nnethercote commented Apr 12, 2026

Uh oh!

petrochenkov commented Apr 13, 2026

Uh oh!

rust-bors Bot commented Apr 13, 2026

Uh oh!

JonathanBrouwer commented Apr 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

nnethercote commented Mar 17, 2026 •

edited

Loading