Extract most code from `define_feedable!` #147393

Zalathar · 2025-10-06T07:55:35Z

This PR extracts most of the non-trivial code from the define_feedable! macro (which defines the TyCtxtFeed::$query methods), and moves it to a helper function query_feed_inner written in ordinary non-macro code.

Doing so should make that code easier to read and modify, because it now gets proper IDE support and has explicit trait bounds.

There should be no change in compiler behaviour.

I've structured the commits so that the actual extraction part is mostly just whitespace changes, making it easier to review individually with whitespace changes hidden.

rustbot · 2025-10-06T07:55:40Z

r? @jackh726

rustbot has assigned @jackh726.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Zalathar · 2025-10-06T07:56:29Z

No perf changes intended, but let's check:

@bors try @rust-timer queue

Extract most code from `define_feedable!`

rust-bors · 2025-10-06T10:12:38Z

☀️ Try build successful (CI)
Build commit: b135ecc (b135ecc5b5ca9773965d5c7368568e9fe2f0f49c, parent: 1a3cdd34629306fa67624eaa60d73687e7fcf855)

cjgillot · 2025-10-06T11:33:36Z

compiler/rustc_middle/src/query/plumbing.rs

 }

+/// Common implementation of query feeding, used by `define_feedable!`.
+pub(crate) fn query_feed_inner<'tcx, Cache, Value>(


Could you put this closer to query_get_at and co? It serves a similar purpose.

Hmm, the downside would be that it's no longer adjacent to the calling code in define_feedable!, so coordinated changes to both would be much less convenient.

I can move it if you want, but to me it seems better off here.

Another approach would be to move the entire family of query-method-inner functions into their own file.

That would allow them to be kept together, without getting lost in a sea of boilerplate macros in query::plumbing.

cjgillot · 2025-10-06T11:36:09Z

compiler/rustc_middle/src/query/plumbing.rs

+/// Common implementation of query feeding, used by `define_feedable!`.
+pub(crate) fn query_feed_inner<'tcx, Cache, Value>(
+    tcx: TyCtxt<'tcx>,
+    name: &'static str,


This should be recoverable from dep_kind in a panic message.

Ah, via tcx.dep_kind_info(dep_kind).name? That should be easy enough.

Yes. Or using Debug for DepKind which uses it internally. It's for ICEs anyway.

rust-timer · 2025-10-06T15:05:06Z

Finished benchmarking commit (b135ecc): comparison URL.

Overall result: no relevant changes - 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

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

Max RSS (memory usage)

Results (primary -7.0%, secondary -5.7%)

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)	-7.0%	[-8.3%, -5.6%]	2
Improvements ✅ (secondary)	-5.7%	[-5.7%, -5.7%]	1
All ❌✅ (primary)	-7.0%	[-8.3%, -5.6%]	2

Cycles

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

Binary size

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

Bootstrap: 471.633s -> 471.589s (-0.01%)
Artifact size: 388.34 MiB -> 388.35 MiB (0.00%)

jackh726 · 2025-10-06T16:15:27Z

r? @cjgillot

Seems you probably are a better reviewer for this PR.

rustbot · 2025-10-08T02:42:07Z

This PR was rebased onto a different master 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.

cjgillot · 2025-10-11T00:20:04Z

Thanks!
@bors r+

bors · 2025-10-11T00:20:06Z

📌 Commit a282336 has been approved by cjgillot

It is now in the queue for this repository.

Zalathar · 2025-10-11T01:47:38Z

Perf results were neutral, so this should be fine for rollup.

@bors rollup=maybe

Extract most code from `define_feedable!` This PR extracts most of the non-trivial code from the `define_feedable!` macro (which defines the `TyCtxtFeed::$query` methods), and moves it to a helper function `query_feed_inner` written in ordinary non-macro code. Doing so should make that code easier to read and modify, because it now gets proper IDE support and has explicit trait bounds. --- There should be no change in compiler behaviour. I've structured the commits so that the actual extraction part is mostly just whitespace changes, making it easier to review individually with whitespace changes hidden.

Rollup of 12 pull requests Successful merges: - #138799 (core: simplify `Extend` for tuples) - #146692 (Save x.py's help text for saving output time) - #147168 (Don't unconditionally build alloc for `no-std` targets) - #147178 ([DebugInfo] Improve formatting of MSVC enum struct variants) - #147240 (Add an ACP list item to the library tracking issue template) - #147246 (Explain not existed key in BTreeMap::split_off) - #147393 (Extract most code from `define_feedable!`) - #147495 (Update wasm-component-ld to 0.5.18) - #147503 (Fix documentation of Instant::now on mac) - #147541 (Change int-to-ptr transmute lowering back to inttoptr) - #147549 (Replace `LLVMRustContextCreate` with normal LLVM-C API calls) - #147596 (Adjust the Arm targets in CI to reflect latest changes) r? `@ghost` `@rustbot` modify labels: rollup

Extract most code from `define_feedable!` This PR extracts most of the non-trivial code from the `define_feedable!` macro (which defines the `TyCtxtFeed::$query` methods), and moves it to a helper function `query_feed_inner` written in ordinary non-macro code. Doing so should make that code easier to read and modify, because it now gets proper IDE support and has explicit trait bounds. --- There should be no change in compiler behaviour. I've structured the commits so that the actual extraction part is mostly just whitespace changes, making it easier to review individually with whitespace changes hidden.

Rollup of 8 pull requests Successful merges: - #138799 (core: simplify `Extend` for tuples) - #145897 (Rehome 30 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [#4 of Batch #2]) - #146692 (Save x.py's help text for saving output time) - #147240 (Add an ACP list item to the library tracking issue template) - #147246 (Explain not existed key in BTreeMap::split_off) - #147393 (Extract most code from `define_feedable!`) - #147503 (Fix documentation of Instant::now on mac) - #147549 (Replace `LLVMRustContextCreate` with normal LLVM-C API calls) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned jackh726 Oct 6, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 6, 2025

Zalathar changed the title ~~Extract most code from define_feedable!~~ Extract most code from define_feedable! Oct 6, 2025

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Oct 6, 2025

Auto merge of #147393 - Zalathar:feed, r=<try>

b135ecc

Extract most code from `define_feedable!`

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 6, 2025

This comment has been minimized.

Sign in to view

cjgillot reviewed Oct 6, 2025

View reviewed changes

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 6, 2025

rustbot assigned cjgillot and unassigned jackh726 Oct 6, 2025

Zalathar force-pushed the feed branch from 4a43a39 to 9f946d6 Compare October 8, 2025 02:42

Zalathar force-pushed the feed branch from 9f946d6 to 70dd54a Compare October 8, 2025 03:10

Zalathar added 4 commits October 8, 2025 17:59

Hoist stranded use declarations

c33b667

Extract query-method inner functions to query::inner

b97bdcb

Prepare define_feedable! for code extraction

cb0c092

Extract most code from define_feedable!

a282336

Zalathar force-pushed the feed branch from 70dd54a to a282336 Compare October 8, 2025 10:00

bors 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 Oct 11, 2025

Zalathar mentioned this pull request Oct 12, 2025

Rollup of 12 pull requests #147598

Closed

matthiaskrgr mentioned this pull request Oct 12, 2025

Rollup of 8 pull requests #147603

Open

Extract most code from define_feedable! #147393

Are you sure you want to change the base?

Extract most code from define_feedable! #147393

Conversation

Zalathar commented Oct 6, 2025

Uh oh!

rustbot commented Oct 6, 2025

Uh oh!

Zalathar commented Oct 6, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Oct 6, 2025

Uh oh!

This comment has been minimized.

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!

Zalathar Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-timer commented Oct 6, 2025

Overall result: no relevant changes - no action needed

Uh oh!

jackh726 commented Oct 6, 2025

Uh oh!

rustbot commented Oct 8, 2025

Uh oh!

cjgillot commented Oct 11, 2025

Uh oh!

bors commented Oct 11, 2025

Uh oh!

Zalathar commented Oct 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Extract most code from `define_feedable!` #147393

Extract most code from `define_feedable!` #147393

Zalathar Oct 6, 2025 •

edited

Loading