Rollup of 19 pull requests - #156023

jhpratt · 2026-05-01T02:28:37Z

Successful merges:

Disentangle AST crates and error crates #155237 (Disentangle AST crates and error crates)
Fix: On wasm targets, call panic_in_cleanup if panic occurs in cleanup #155249 (Fix: On wasm targets, call panic_in_cleanup if panic occurs in cleanup)
Use _mcount as the mcount symbol name on RISC-V Linux GNU targets #155853 (Use _mcount as the mcount symbol name on RISC-V Linux GNU targets)
simplify ast_fragments! #155919 (simplify ast_fragments!)
Add feature gate for view_types experiment #155939 (Add feature gate for view_types experiment)
rustdoc: preserve parent doc cfg for macro_export macros #155954 (rustdoc: preserve parent doc cfg for macro_export macros)
add c_variadic_experimental_arch feature #155974 (add c_variadic_experimental_arch feature)
Catch unwinds from the global ctxt callback to complete queries profiling data in more cases #155991 (Catch unwinds from the global ctxt callback to complete queries profiling data in more cases)
Pass Session to optimize_and_codegen_fat_lto #156003 (Pass Session to optimize_and_codegen_fat_lto)
Add suggestion for E0401 on inner const items #153566 (Add suggestion for E0401 on inner const items)
Suggest public re-exports when a private module makes an import path inaccessible #154610 (Suggest public re-exports when a private module makes an import path inaccessible)
Reorganize tests/ui/issues/ - 02 #155523 (Reorganize tests/ui/issues/ - 02)
c-variadic: document Clone and Drop instances and require VaArgSafe: Copy #155821 (c-variadic: document Clone and Drop instances and require VaArgSafe: Copy)
Move feature* methods from parse mod to errors mod. #155980 (Move feature* methods from parse mod to errors mod.)
Make lifting infallible #155987 (Make lifting infallible)
tests/run-make/print-cfg: add Android target_env case #155988 (tests/run-make/print-cfg: add Android target_env case)
Fix ICE when using -Zinstrument-mcount and -Clinker-flavor=lld #156000 (Fix ICE when using -Zinstrument-mcount and -Clinker-flavor=lld)
Allow to use Diagnostic directly in SharedContext::emit_lint #156002 (Allow to use Diagnostic directly in SharedContext::emit_lint)
rustc-dev-guide subtree update #156015 (rustc-dev-guide subtree update)

When an import like `use crate::a::b::Item` fails because module `b` is private, the resolver now looks up public re-export paths for `Item` and suggests them to the user.

…le errors

Update link to queries.rs in tracing.md

…nts-description Update THIR element description

sembr some files

This updates the rust-version file to d493b7c.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@d493b7c Filtered ref: rust-lang/rustc-dev-guide@8e19834 Upstream diff: rust-lang/rust@cf1817b...d493b7c This merge was created using https://github.com/rust-lang/josh-sync.

Rustc pull update

Rollup of 19 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-2

rust-bors · 2026-05-01T05:28:29Z

☀️ Try build successful (CI)
Build commit: cd5e1c5 (cd5e1c5583615b650b633e035418395dcb5a0c1e, parent: f53b654a8882fd5fc036c4ca7a4ff41ce32497a6)

rust-bors · 2026-05-01T07:42:20Z

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 27m 16s
Pushing 0469a92 to main...

github-actions · 2026-05-01T07:45:31Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing f53b654 (parent) -> 0469a92 (this PR)

Test differences

Show 132 test diffs

Stage 1

[codegen] tests/codegen-llvm/double_panic_wasm.rs: [missing] -> ignore (only executed when the architecture is wasm32) (J0)
[rustdoc-html] tests/rustdoc-html/doc-cfg/decl-macro.rs: [missing] -> pass (J0)
[ui] tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.rs: [missing] -> pass (J0)
[ui] tests/ui/attributes/repr-on-single-variant-Enum.rs: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#avr: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#m68k: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#msp430: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#riscv32e: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#sparc: [missing] -> pass (J0)
[ui] tests/ui/feature-gates/feature-gate-view-types.rs: [missing] -> pass (J0)
[ui] tests/ui/foreign/foreign-fn-with-more-than-8-byte-arg-size.rs: [missing] -> pass (J0)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2015: [missing] -> pass (J0)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2018: [missing] -> pass (J0)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2021: [missing] -> pass (J0)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2024: [missing] -> pass (J0)
[ui] tests/ui/issues/issue-19001.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-31769.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-33202.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-38763.rs: pass -> [missing] (J0)
[ui] tests/ui/recursion/recursive-struct-with-raw-pointer-field.rs: [missing] -> pass (J0)
[ui] tests/ui/resolve/generic-params-from-outer-item-suggestion.rs: [missing] -> pass (J0)
[codegen] tests/codegen-llvm/c-variadic-va-end.rs: [missing] -> pass (J2)
[codegen] tests/codegen-llvm/double_panic_wasm.rs: [missing] -> ignore (ignored on targets without unwinding support) (J7)

Stage 2

[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#avr: [missing] -> pass (J1)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#m68k: [missing] -> pass (J1)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#msp430: [missing] -> pass (J1)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#riscv32e: [missing] -> pass (J1)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#sparc: [missing] -> pass (J1)
[ui] tests/ui/attributes/dont-allow-inline-and-repr-at-invalid-positions.rs: [missing] -> pass (J3)
[ui] tests/ui/attributes/repr-on-single-variant-Enum.rs: [missing] -> pass (J3)
[ui] tests/ui/feature-gates/feature-gate-view-types.rs: [missing] -> pass (J3)
[ui] tests/ui/foreign/foreign-fn-with-more-than-8-byte-arg-size.rs: [missing] -> pass (J3)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2015: [missing] -> pass (J3)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2018: [missing] -> pass (J3)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2021: [missing] -> pass (J3)
[ui] tests/ui/imports/suggest-public-reexport-for-use.rs#edition2024: [missing] -> pass (J3)
[ui] tests/ui/issues/issue-19001.rs: pass -> [missing] (J3)
[ui] tests/ui/issues/issue-31769.rs: pass -> [missing] (J3)
[ui] tests/ui/issues/issue-33202.rs: pass -> [missing] (J3)
[ui] tests/ui/issues/issue-38763.rs: pass -> [missing] (J3)
[ui] tests/ui/recursion/recursive-struct-with-raw-pointer-field.rs: [missing] -> pass (J3)
[ui] tests/ui/resolve/generic-params-from-outer-item-suggestion.rs: [missing] -> pass (J3)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#avr: [missing] -> ignore (gcc backend is marked as ignore) (J4)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#m68k: [missing] -> ignore (gcc backend is marked as ignore) (J4)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#msp430: [missing] -> ignore (gcc backend is marked as ignore) (J4)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#riscv32e: [missing] -> ignore (gcc backend is marked as ignore) (J4)
[ui] tests/ui/feature-gates/feature-gate-c_variadic_experimental_arch.rs#sparc: [missing] -> ignore (gcc backend is marked as ignore) (J4)
[codegen] tests/codegen-llvm/c-variadic-va-end.rs: [missing] -> pass (J5)
[codegen] tests/codegen-llvm/double_panic_wasm.rs: [missing] -> ignore (only executed when the architecture is wasm32) (J5)
[rustdoc-html] tests/rustdoc-html/doc-cfg/decl-macro.rs: [missing] -> pass (J6)

Additionally, 82 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 0469a92a76c327df972cb6c1356934b7a0c6b86d --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

dist-i686-msvc: 1h 45m -> 2h 23m (+35.8%)
dist-aarch64-apple: 2h 9m -> 1h 31m (-29.5%)
x86_64-gnu-aux: 2h 21m -> 1h 45m (-25.2%)
x86_64-gnu-llvm-22-3: 1h 29m -> 1h 49m (+23.4%)
pr-check-1: 27m 5s -> 33m 17s (+22.9%)
dist-arm-linux-musl: 1h 42m -> 1h 19m (-22.8%)
x86_64-gnu: 2h 20m -> 1h 50m (-21.1%)
x86_64-gnu-tools: 52m 58s -> 1h 4m (+20.9%)
i686-gnu-1: 2h 2m -> 2h 27m (+19.7%)
i686-msvc-1: 2h 54m -> 2h 19m (-19.6%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2026-05-01T07:47:56Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#153566	Add suggestion for E0401 on inner const items	`767415b88ef4d8a967e1b95030c340a4a3de1b29` (link)
#154610	Suggest public re-exports when a private module makes an im…	`5ced07951cb88b67d94b19f0992042094bf919fa` (link)
#155237	Disentangle AST crates and error crates	`e518d9ff11d9958947a16d07db6bf122d740dd2c` (link)
#155249	Fix: On wasm targets, call `panic_in_cleanup` if panic occu…	`60be315adcb0ae612e308b754788ae06dfe6ab93` (link)
#155523	Reorganize `tests/ui/issues/` - 02	`35519572f3541846aefcaf965a6965027ff949c1` (link)
#155821	c-variadic: document `Clone` and `Drop` instances and requi…	`4dc40d106f57072d27616f4ca4066443f526497b` (link)
#155853	Use `_mcount` as the mcount symbol name on RISC-V Linux GNU…	`8013368f743812eb1bb6e28f51f62b11a3bc7098` (link)
#155919	simplify `ast_fragments!`	`5f369d054765fca26fd397f5070a451de4a1b286` (link)
#155939	Add feature gate for view_types experiment	`8891d62a8c82ec66515f271d913e8cd11f3c0ba1` (link)
#155954	rustdoc: preserve parent doc cfg for `macro_export` macros	`40350fe83c04f0c78b7bc64419d68261679f7fa5` (link)
#155974	add `c_variadic_experimental_arch` feature	`f318cb68b413ea911bb6afa38b36f8e3b701bad2` (link)
#155980	Move `feature*` methods from `parse` mod to `errors` mod.	`e6afe2e6165b3da66749503dc02c11be69fe9a6e` (link)
#155987	Make lifting infallible	`1731b1eb48b23046a5c37212f6c312f780ad5058` (link)
#155988	tests/run-make/print-cfg: add Android target_env case	`d2e8c517e007f24f971ca085facae25d12483c9e` (link)
#155991	Catch unwinds from the global ctxt callback to complete que…	`7bf4037475860673d5ed3145ca63130f353dd2ab` (link)
#156000	Fix ICE when using -Zinstrument-mcount and -Clinker-flavor=…	`88e8277e9c2c2bee56d39c555e16b8188c1e3897` (link)
#156002	Allow to use `Diagnostic` directly in `SharedContext::emit_…	`4855bf1c70e8ab554092d3d49152d9fc43a99596` (link)
#156003	Pass Session to optimize_and_codegen_fat_lto	`98eb0a006bc3eefd0af5156d5c68db2eb953f1ef` (link)
#156015	rustc-dev-guide subtree update	`3dc18c146c9569a6b93c5663aef88ae1c704c14c` (link)

previous master: f53b654a88

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2026-05-01T08:56:49Z

Finished benchmarking commit (0469a92): comparison URL.

Overall result: ❌ regressions - please read:

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.3%	[0.2%, 0.3%]	7
Regressions ❌ (secondary)	0.5%	[0.3%, 0.7%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.2%, 0.3%]	7

Max RSS (memory usage)

Results (secondary 1.9%)

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)	3.8%	[3.6%, 4.1%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.9%	[-3.9%, -3.9%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary -0.6%)

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)	3.1%	[3.1%, 3.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.3%	[-4.3%, -4.3%]	1
All ❌✅ (primary)	-	-	0

Binary size

Results (primary -0.0%, 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.1%	[0.1%, 0.1%]	1
Improvements ✅ (primary)	-0.0%	[-0.0%, -0.0%]	7
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.1%]	3
All ❌✅ (primary)	-0.0%	[-0.0%, -0.0%]	7

Bootstrap: 487.787s -> 481.713s (-1.25%)
Artifact size: 390.97 MiB -> 390.96 MiB (-0.00%)

panstromek · 2026-05-05T08:41:57Z

perf triage:

Tiny regressions in frontend (mainly expand_crate, so likely macro expansion). Primary regressions are limited to very small benchmarks (incr-unchanged), secondary one is just a macro expansion stress test.

I suspect it's one of the PRs that touches this code - #155237, #155919 or #155980, but all those changes look pretty innocent, so I think it's probably something like an inlining change caused by moving code around.

I don't think this is worth digging into more, but the queue is empty so I kicked off a perf run on #155237.

@rustbot label: +perf-regression-triaged

Rollup of 19 pull requests Successful merges: - rust-lang#155237 (Disentangle AST crates and error crates) - rust-lang#155249 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup) - rust-lang#155853 (Use `_mcount` as the mcount symbol name on RISC-V Linux GNU targets) - rust-lang#155919 (simplify `ast_fragments!`) - rust-lang#155939 (Add feature gate for view_types experiment) - rust-lang#155954 (rustdoc: preserve parent doc cfg for `macro_export` macros) - rust-lang#155974 (add `c_variadic_experimental_arch` feature) - rust-lang#155991 (Catch unwinds from the global ctxt callback to complete queries profiling data in more cases) - rust-lang#156003 (Pass Session to optimize_and_codegen_fat_lto) - rust-lang#153566 (Add suggestion for E0401 on inner const items) - rust-lang#154610 (Suggest public re-exports when a private module makes an import path inaccessible) - rust-lang#155523 (Reorganize `tests/ui/issues/` - 02) - rust-lang#155821 (c-variadic: document `Clone` and `Drop` instances and require `VaArgSafe: Copy`) - rust-lang#155980 (Move `feature*` methods from `parse` mod to `errors` mod.) - rust-lang#155987 (Make lifting infallible) - rust-lang#155988 (tests/run-make/print-cfg: add Android target_env case) - rust-lang#156000 (Fix ICE when using -Zinstrument-mcount and -Clinker-flavor=lld) - rust-lang#156002 (Allow to use `Diagnostic` directly in `SharedContext::emit_lint`) - rust-lang#156015 (rustc-dev-guide subtree update)

JohnTitor and others added 30 commits March 8, 2026 22:02

Add suggestion for E0401 on inner const items

65a91d1

Suggest public re-exports when a private module blocks an import path

3f7c645

When an import like `use crate::a::b::Item` fails because module `b` is private, the resolver now looks up public re-export paths for `Item` and suggests them to the user.

Add and update tests for public re-export suggestions on private modu…

70fd887

…le errors

Parametrise the newly added test by all four editions

d4617fa

Update the expected results for two other tests

d09d4c9

Move test files from issues/ to appropriate subdirectories

526f3d9

Add issue links

c4f6148

Update link to queries.rs in tracing.md

560a630

Merge pull request rust-lang/rustc-dev-guide#2847 from rust-lang/query

b7a2ece

Update link to queries.rs in tracing.md

Clarify THIR element layout description

3a55fcb

Merge pull request rust-lang#2848 from cijiugechu/fix/thir-docs-eleme…

4bbca88

…nts-description Update THIR element description

sembr src/thir.md

5736354

sembr src/name-resolution.md

8679acc

missing pause

cd43421

sembr src/building/suggested.md

4bcdedb

sembr src/building/prerequisites.md

2fa6f28

reflow

f7f2886

whose laptop

364e9eb

sembr src/mir/construction.md

4ee98f7

reflow

64e9964

Merge pull request rust-lang#2849 from rust-lang/tshepang/sembr

5a36fea

sembr some files

Prepare for merging from rust-lang/rust

2d1be67

This updates the rust-version file to d493b7c.

Merge pull request rust-lang#2850 from rust-lang/rustc-pull

a648b65

Rustc pull update

sembr src/offload/installation.md

f365db2

use a more correct code marker

01918c0

sembr src/autodiff/installation.md

1f56bde

sembr src/offload/internals.md

04a5aa6

reflow

b2267ae

sembr src/offload/contributing.md

183c7e5

rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 1, 2026

rust-bors Bot merged commit 0469a92 into rust-lang:main May 1, 2026
13 checks passed

rust-bors Bot mentioned this pull request May 1, 2026

Make create_def a query #155777

Open

jhpratt deleted the rollup-sZeK85e branch May 1, 2026 07:45

rustbot added the perf-regression Performance regression. label May 1, 2026

panstromek mentioned this pull request May 5, 2026

Disentangle AST crates and error crates #155237

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label May 5, 2026

ehuss added this to the 1.97.0 milestone May 28, 2026

Navigation Menu

Uh oh!

Rollup of 19 pull requests - #156023