[rustdoc] Replace `DocContext` with `TyCtxt` wherever possible by GuillaumeGomez · Pull Request #154680 · rust-lang/rust

GuillaumeGomez · 2026-04-01T14:13:40Z

In a lot of places, we pass down DocContext but actually only use its tcx field (TyCtxt). To make it more obvious what's actually being done, I replaced DocContext with TyCtxt (which implements Copy) in the function arguments. It created quite the cascade effect so I ended up with a lot more changes I expected.

Because it's a lot of changes, I made small commits which are easy to go through, so I strongly recommend reviewing this PR one commit at a time.

r? @Urgau

…attrs` function

…_attrs` function

…y_macro_source` function

…_macro` function

…middle_region` function

…region_outlives_predicate` function

…proc_macro` function

…f_id_and_parts` function

…field_with_def_id` function

…cBound` methods

…bound_vars` function

…ctions

…const` function

GuillaumeGomez · 2026-04-01T14:20:39Z

Just to be sure:

@bors try @rust-timer queue

[rustdoc] Replace `DocContext` with `TyCtxt` wherever possible

rust-bors · 2026-04-01T16:33:56Z

☀️ Try build successful (CI)
Build commit: 80eb201 (80eb201d793b80fc4fd20a891e9f721347349c32, parent: 2bd7a97871a74d4333bd3edb6564136167ac604b)

Urgau

I appreciate the effort you put into making small commits. It makes the review process easier.

Looks good to me.
r=me if perf and CI are good

View changes since this review

rust-timer · 2026-04-01T17:14:04Z

Finished benchmarking commit (80eb201): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.0%, 0.1%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.1%	[-0.3%, -0.0%]	3
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -1.1%)

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)	-1.1%	[-1.2%, -1.0%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.1%	[-1.2%, -1.0%]	2

Cycles

Results (primary 2.3%, secondary 0.5%)

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

	mean	range	count
Regressions ❌ (primary)	2.3%	[2.3%, 2.3%]	1
Regressions ❌ (secondary)	4.9%	[4.3%, 5.4%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.9%	[-5.9%, -2.1%]	3
All ❌✅ (primary)	2.3%	[2.3%, 2.3%]	1

Binary size

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

Bootstrap: 488.823s -> 484.984s (-0.79%)
Artifact size: 397.06 MiB -> 394.91 MiB (-0.54%)

GuillaumeGomez · 2026-04-01T19:08:55Z

Seems like perf results are just noise since no doc perf check is impacted.

@bors r=Urgau rollup

rust-bors · 2026-04-01T19:08:58Z

📌 Commit 0b941ed has been approved by Urgau

It is now in the queue for this repository.

@Urgau

… r=Urgau [rustdoc] Replace `DocContext` with `TyCtxt` wherever possible In a lot of places, we pass down `DocContext` but actually only use its `tcx` field (`TyCtxt`). To make it more obvious what's actually being done, I replaced `DocContext` with `TyCtxt` (which implements `Copy`) in the function arguments. It created quite the cascade effect so I ended up with a lot more changes I expected. Because it's a lot of changes, I made small commits which are easy to go through, so I strongly recommend reviewing this PR one commit at a time. r? @Urgau

Rollup of 7 pull requests Successful merges: - #153105 (Compute the result of a projection type with region errors) - #153960 (Make `layout_of` cycles fatal errors) - #154666 (Remove `StableHashContext` impls) - #154669 (Introduce #[diagnostic::on_move] on `Arc`) - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`) - #154660 (Avoid creating async return opaques for foreign async fns) - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)

@Urgau

… r=Urgau [rustdoc] Replace `DocContext` with `TyCtxt` wherever possible In a lot of places, we pass down `DocContext` but actually only use its `tcx` field (`TyCtxt`). To make it more obvious what's actually being done, I replaced `DocContext` with `TyCtxt` (which implements `Copy`) in the function arguments. It created quite the cascade effect so I ended up with a lot more changes I expected. Because it's a lot of changes, I made small commits which are easy to go through, so I strongly recommend reviewing this PR one commit at a time. r? @Urgau

Rollup of 11 pull requests Successful merges: - #153105 (Compute the result of a projection type with region errors) - #153286 (various fixes for scalable vectors) - #153960 (Make `layout_of` cycles fatal errors) - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization) - #154666 (Remove `StableHashContext` impls) - #154669 (Introduce #[diagnostic::on_move] on `Arc`) - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`) - #154644 (rustdoc: seperate methods and associated functions in sidebar) - #154660 (Avoid creating async return opaques for foreign async fns) - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args) - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)

@Urgau

… r=Urgau [rustdoc] Replace `DocContext` with `TyCtxt` wherever possible In a lot of places, we pass down `DocContext` but actually only use its `tcx` field (`TyCtxt`). To make it more obvious what's actually being done, I replaced `DocContext` with `TyCtxt` (which implements `Copy`) in the function arguments. It created quite the cascade effect so I ended up with a lot more changes I expected. Because it's a lot of changes, I made small commits which are easy to go through, so I strongly recommend reviewing this PR one commit at a time. r? @Urgau

Rollup of 11 pull requests Successful merges: - #153105 (Compute the result of a projection type with region errors) - #153960 (Make `layout_of` cycles fatal errors) - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization) - #154666 (Remove `StableHashContext` impls) - #154669 (Introduce #[diagnostic::on_move] on `Arc`) - #154213 (tidy-alphabetical: fix line number in error message) - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`) - #154644 (rustdoc: seperate methods and associated functions in sidebar) - #154660 (Avoid creating async return opaques for foreign async fns) - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args) - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)

@Urgau

… r=Urgau [rustdoc] Replace `DocContext` with `TyCtxt` wherever possible In a lot of places, we pass down `DocContext` but actually only use its `tcx` field (`TyCtxt`). To make it more obvious what's actually being done, I replaced `DocContext` with `TyCtxt` (which implements `Copy`) in the function arguments. It created quite the cascade effect so I ended up with a lot more changes I expected. Because it's a lot of changes, I made small commits which are easy to go through, so I strongly recommend reviewing this PR one commit at a time. r? @Urgau

…uwer Rollup of 21 pull requests Successful merges: - #153105 (Compute the result of a projection type with region errors) - #153286 (various fixes for scalable vectors) - #153532 (Attributes containing rustc) - #153960 (Make `layout_of` cycles fatal errors) - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization) - #154666 (Remove `StableHashContext` impls) - #154669 (Introduce #[diagnostic::on_move] on `Arc`) - #154710 (opaque_generic_const_args -> generic_const_args) - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph") - #154713 (Stop compiling when we get resolving crate failure) - #154213 (tidy-alphabetical: fix line number in error message) - #154425 (Migrate transmute tests) - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`) - #154469 (mGCA: Lower spans for literal const args) - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`) - #154615 (Moving issues) - #154644 (rustdoc: seperate methods and associated functions in sidebar) - #154660 (Avoid creating async return opaques for foreign async fns) - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args) - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible) - #154709 (Revert `Ty` type alias in `rustc_type_ir`)

@Urgau

… r=Urgau [rustdoc] Replace `DocContext` with `TyCtxt` wherever possible In a lot of places, we pass down `DocContext` but actually only use its `tcx` field (`TyCtxt`). To make it more obvious what's actually being done, I replaced `DocContext` with `TyCtxt` (which implements `Copy`) in the function arguments. It created quite the cascade effect so I ended up with a lot more changes I expected. Because it's a lot of changes, I made small commits which are easy to go through, so I strongly recommend reviewing this PR one commit at a time. r? @Urgau

…uwer Rollup of 21 pull requests Successful merges: - #153105 (Compute the result of a projection type with region errors) - #153286 (various fixes for scalable vectors) - #153532 (Attributes containing rustc) - #153960 (Make `layout_of` cycles fatal errors) - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization) - #154666 (Remove `StableHashContext` impls) - #154669 (Introduce #[diagnostic::on_move] on `Arc`) - #154710 (opaque_generic_const_args -> generic_const_args) - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph") - #153614 (`FindParamInClause` handle edge-cases) - #154213 (tidy-alphabetical: fix line number in error message) - #154425 (Migrate transmute tests) - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`) - #154469 (mGCA: Lower spans for literal const args) - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`) - #154615 (Moving issues) - #154644 (rustdoc: seperate methods and associated functions in sidebar) - #154660 (Avoid creating async return opaques for foreign async fns) - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args) - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible) - #154709 (Revert `Ty` type alias in `rustc_type_ir`)

…uwer Rollup of 20 pull requests Successful merges: - #153105 (Compute the result of a projection type with region errors) - #153532 (Attributes containing rustc) - #153960 (Make `layout_of` cycles fatal errors) - #154527 (Emit pre-expansion feature gate warnings for negative impls and specialization) - #154666 (Remove `StableHashContext` impls) - #154669 (Introduce #[diagnostic::on_move] on `Arc`) - #154710 (opaque_generic_const_args -> generic_const_args) - #154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph") - #153614 (`FindParamInClause` handle edge-cases) - #154213 (tidy-alphabetical: fix line number in error message) - #154425 (Migrate transmute tests) - #154442 (Export `derive` at the crate root: `core::derive` and `std::derive`) - #154469 (mGCA: Lower spans for literal const args) - #154578 (Rename `probe_ty_var` to `try_resolve_ty_var`) - #154615 (Moving issues) - #154644 (rustdoc: seperate methods and associated functions in sidebar) - #154660 (Avoid creating async return opaques for foreign async fns) - #154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args) - #154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible) - #154709 (Revert `Ty` type alias in `rustc_type_ir`)

@Urgau

Rollup merge of #154680 - GuillaumeGomez:doccontext-cleanup, r=Urgau [rustdoc] Replace `DocContext` with `TyCtxt` wherever possible In a lot of places, we pass down `DocContext` but actually only use its `tcx` field (`TyCtxt`). To make it more obvious what's actually being done, I replaced `DocContext` with `TyCtxt` (which implements `Copy`) in the function arguments. It created quite the cascade effect so I ended up with a lot more changes I expected. Because it's a lot of changes, I made small commits which are easy to go through, so I strongly recommend reviewing this PR one commit at a time. r? @Urgau

GuillaumeGomez added 14 commits April 1, 2026 14:31

Replace DocContext argument with TyCtxt in rustdoc `inline::load_…

a7a7938

…attrs` function

Replace DocContext argument with TyCtxt in rustdoc `inline::merge…

65fbfa4

…_attrs` function

Replace DocContext argument with TyCtxt in rustdoc `utils::displa…

9f95c38

…y_macro_source` function

Replace DocContext argument with TyCtxt in rustdoc `inline::build…

f3ba2c4

…_macro` function

Replace DocContext argument with TyCtxt in rustdoc `clean::clean_…

58077cc

…middle_region` function

Replace DocContext argument with TyCtxt in rustdoc `clean::clean_…

5a48d5e

…region_outlives_predicate` function

Replace DocContext argument with TyCtxt in rustdoc `clean::clean_…

d77a2ea

…proc_macro` function

Replace DocContext argument with TyCtxt in rustdoc `Type::from_de…

3520351

…f_id_and_parts` function

Replace DocContext argument with TyCtxt in rustdoc `clean::clean_…

509a444

…field_with_def_id` function

Replace DocContext argument with TyCtxt in rustdoc `types::Generi…

822579e

…cBound` methods

Replace DocContext argument with TyCtxt in rustdoc `clean::clean_…

e2f3f78

…bound_vars` function

Replace DocContext argument with TyCtxt in rustdoc simplify fun…

28ca36d

…ctions

Remove unused DocContext argument in clean_middle_const

14aa3a9

Replace DocContext argument with TyCtxt in rustdoc `utils::print_…

4b39934

…const` function

rustbot assigned Urgau Apr 1, 2026

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 1, 2026

This comment has been minimized.

Sign in to view

Last DocContext/TyCtxt cleanup

0b941ed

GuillaumeGomez force-pushed the doccontext-cleanup branch from bc45950 to 0b941ed Compare April 1, 2026 14:20

This comment has been minimized.

Sign in to view

rust-bors bot pushed a commit that referenced this pull request Apr 1, 2026

Auto merge of #154680 - GuillaumeGomez:doccontext-cleanup, r=<try>

80eb201

[rustdoc] Replace `DocContext` with `TyCtxt` wherever possible

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

This comment has been minimized.

Sign in to view

Urgau approved these changes Apr 1, 2026

View reviewed changes

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 1, 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 1, 2026

GuillaumeGomez mentioned this pull request Apr 1, 2026

Rollup of 7 pull requests #154693

Closed

jhpratt mentioned this pull request Apr 2, 2026

Rollup of 11 pull requests #154701

Closed

jhpratt mentioned this pull request Apr 2, 2026

Rollup of 11 pull requests #154705

Closed

JonathanBrouwer mentioned this pull request Apr 2, 2026

Rollup of 21 pull requests #154716

Closed

JonathanBrouwer mentioned this pull request Apr 2, 2026

Rollup of 21 pull requests #154718

Closed

JonathanBrouwer mentioned this pull request Apr 2, 2026

Rollup of 20 pull requests #154727

Merged

rust-bors bot merged commit a788dd0 into rust-lang:main Apr 2, 2026
12 checks passed

rustbot added this to the 1.96.0 milestone Apr 2, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[rustdoc] Replace `DocContext` with `TyCtxt` wherever possible#154680

[rustdoc] Replace `DocContext` with `TyCtxt` wherever possible#154680
rust-bors[bot] merged 15 commits intorust-lang:mainfrom
GuillaumeGomez:doccontext-cleanup

GuillaumeGomez commented Apr 1, 2026

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Apr 1, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Apr 1, 2026

Uh oh!

This comment has been minimized.

Urgau left a comment •

edited by rustbot

Loading

Uh oh!

rust-timer commented Apr 1, 2026

Uh oh!

GuillaumeGomez commented Apr 1, 2026

Uh oh!

rust-bors bot commented Apr 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

GuillaumeGomez commented Apr 1, 2026

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Apr 1, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Apr 1, 2026

Uh oh!

This comment has been minimized.

Urgau left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-timer commented Apr 1, 2026

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

GuillaumeGomez commented Apr 1, 2026

Uh oh!

rust-bors bot commented Apr 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Urgau left a comment •

edited by rustbot

Loading