Rollup of 8 pull requests #151835

JonathanBrouwer · 2026-01-29T16:47:33Z

Successful merges:

hir_owner_parent optimized to inlined call for non-incremental build #147387 (hir_owner_parent optimized to inlined call for non-incremental build)
Move struct placeholder pt2 #150271 (Move struct placeholder pt2)
Suggest ignore returning value inside macro for unused_must_use lint #151283 (Suggest ignore returning value inside macro for unused_must_use lint)
Rename, clarify, and document code for "erasing" query values #151565 (Rename, clarify, and document code for "erasing" query values)
thread::scope: document how join interacts with TLS destructors #149482 (thread::scope: document how join interacts with TLS destructors)
Use Rustc prefix for rustc attrs in AttributeKind #151827 (Use Rustc prefix for rustc attrs in AttributeKind)
Treat unions as 'data types' in attr parsing diagnostics #151833 (Treat unions as 'data types' in attr parsing diagnostics)
Update askama version to 0.15.4 #151834 (Update askama version to 0.15.4)

…pt, r=petrochenkov hir_owner_parent optimized to inlined call for non-incremental build Continuation of rust-lang#146880 and rust-lang#147232. 'hir_owner_parent' query renamed 'hir_owner_parent_q'. hir_owner_parent inlined function added to optimize performance in case of non-incremental build. 'hir_owner_parent' query has low normalized average execution time (163ns) and good cache_hits (5773) according Daria's processed statistics. 'source_span', for comparison, has avg_ns_norm = 66ns and cache_hits = 11361. Optimization may be profitable for queries with low normalized average execution time (to replace cache lookup into inlined call) and be significant with good cache_hits. | Query | cache_hits | min_ns | max_ns | avg_ns_norm | | ------------- | ------------- | ------------- | ------------- | ------------- | source_span | 11361 | 18 | 2991 | 66 hir_owner_parent | 5773 | 52 | 1773 | 163 is_doc_hidden | 3134 | 47 | 1111 | 285 lookup_deprecation_entry | 13905 | 36 | 6208 | 287 object_lifetime_default | 5840 | 63 | 4688 | 290 upvars_mentioned | 2575 | 75 | 7722 | 322 intrinsic_raw | 21235 | 73 | 3453 | 367 Draft PR to measure performance changes.

…-placeholder-pt2, r=lcnr Move struct placeholder pt2 r? ghost

…, r=petrochenkov Suggest ignore returning value inside macro for unused_must_use lint Fixes rust-lang#151269 The first commit fix the original issue, the second commit is a code refactoring in this lint.

Rename, clarify, and document code for "erasing" query values In order to reduce compile times and code size for the compiler itself, the query system has a mechanism for “erasing” and ”restoring” query values in certain contexts. See rust-lang#109333 for the original implementation. Unfortunately, the erasure system has very little documentation, and involves a dizzying assortment of similarly-named types, traits, and functions. This PR therefore renames several parts of the erasure API and implementation to hopefully be clearer, and adds comments to better explain the purpose and mechanism behind value erasure. Summary of renames: - fn `erase` → `erase_val` (avoiding ambiguity with module `erase`) - fn `restore` → `restore_val` - type `Erase<T>` → `Erased<T>` (for actual erased values of `T`) - trait `EraseType` → `Erasable` (for types that can be erased and restored) - associated type `EraseType::Result` → `Erasable::Storage` - implementation-detail struct `Erased<T>` → `ErasedData<Storage>` There should be no change to compiler behaviour.

thread::scope: document how join interacts with TLS destructors Fixes rust-lang#116237 by documenting the current behavior regarding thread-local destructors as intended. (I'm not stoked about this, but documenting it is better than leaving it unclear.) This also adds documentation for explicit `join` calls (both for scoped and regular threads), saying that those *will* wait for TLS destructors. That reflects my understanding of the current implementation, which calls `join` on the native thread handle. Are we okay with guaranteeing that? I think we should, so people have at least some chance of implementing "wait for all destructors" manually. This fixes rust-lang#127571. Cc @rust-lang/libs-api

@jdonszelmann

…szelmann,JonathanBrouwer Use `Rustc` prefix for `rustc` attrs in `AttributeKind` cc rust-lang#131229 Most `rustc_...` attrs have their variants named `RustcAttrName`, but several do not. Rename these attributes for consistency. r? @jdonszelmann

…uwer Treat unions as 'data types' in attr parsing diagnostics I found 'data types _and_ unions' to be a little surprising

…illaumeGomez Update `askama` version to `0.15.4` Hopefully it's the last `askama` update before a while. ^^' r? ghost

JonathanBrouwer · 2026-01-29T16:47:40Z

@bors r+ rollup=never p=5

rust-bors · 2026-01-29T16:47:43Z

📌 Commit 0f318f9 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rust-bors · 2026-01-29T20:24:55Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 36m 15s
Pushing 842bd5b to main...

rust-timer · 2026-01-29T20:27:14Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#147387	hir_owner_parent optimized to inlined call for non-incremen…	`9fb64fcc1557291c38c1acd22a3e5e4221180fd8` (link)
#149482	thread::scope: document how join interacts with TLS destruc…	`baae1e2a0c2e6ab32d7d38ac4d488d75df919671` (link)
#150271	Move struct placeholder pt2	`ec981e31d935a986f124b23e450c7b4cc4149d8c` (link)
#151283	Suggest ignore returning value inside macro for unused_must…	`c9dfd9e09cb3b6bbd88247c61c9e957220cc7f05` (link)
#151565	Rename, clarify, and document code for "erasing" query valu…	`6da7a99b89003dbaa50b3b43dccf9d7ee9b09387` (link)
#151827	Use `Rustc` prefix for `rustc` attrs in `AttributeKind`	`74a6d240b02b2783a897031decbc81450f2b3ed0` (link)
#151833	Treat unions as 'data types' in attr parsing diagnostics	`f6da8d2a020497f2c004aed57c19d433569dd95a` (link)
#151834	Update `askama` version to `0.15.4`	`085dae2dbc2aaa6cd9d82bf8cdcdb3dd463f4166` (link)

previous master: 370143facf

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

github-actions · 2026-01-29T20:27:33Z

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 370143f (parent) -> 842bd5b (this PR)

Test differences

Show 308 test diffs

Stage 1

[ui] tests/ui/lint/unused/lint-unsed-in-macro-issue-151269.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/lint/unused/lint-unsed-in-macro-issue-151269.rs: [missing] -> pass (J0)

Additionally, 306 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 842bd5be253e17831e318fdbd9d01d716557cc75 --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-apple-various: 3297.4s -> 4144.7s (+25.7%)
dist-aarch64-apple: 9913.1s -> 7968.9s (-19.6%)
dist-x86_64-apple: 7774.2s -> 8599.5s (+10.6%)
dist-x86_64-msvc-alt: 9885.3s -> 8957.1s (-9.4%)
x86_64-msvc-ext1: 7287.5s -> 7950.8s (+9.1%)
dist-aarch64-linux: 6911.9s -> 6297.5s (-8.9%)
aarch64-gnu-llvm-20-1: 3569.7s -> 3875.2s (+8.6%)
i686-gnu-1: 8650.8s -> 7923.9s (-8.4%)
dist-s390x-linux: 5385.8s -> 5813.9s (+7.9%)
dist-x86_64-linux-alt: 8763.1s -> 9448.5s (+7.8%)

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-01-29T21:06:48Z

Finished benchmarking commit (842bd5b): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -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
Improvements ✅ (primary)	-0.2%	[-0.3%, -0.2%]	4
Improvements ✅ (secondary)	-0.7%	[-1.1%, -0.2%]	6
All ❌✅ (primary)	-0.2%	[-0.3%, -0.2%]	4

Max RSS (memory usage)

Results (primary 0.8%, secondary -1.5%)

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

	mean	range	count
Regressions ❌ (primary)	0.8%	[0.8%, 0.8%]	1
Regressions ❌ (secondary)	0.9%	[0.9%, 0.9%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.7%	[-4.3%, -1.1%]	2
All ❌✅ (primary)	0.8%	[0.8%, 0.8%]	1

Cycles

Results (primary -8.8%, secondary -2.3%)

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)	-8.8%	[-13.7%, -2.3%]	10
Improvements ✅ (secondary)	-2.3%	[-2.3%, -2.3%]	1
All ❌✅ (primary)	-8.8%	[-13.7%, -2.3%]	10

Binary size

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

Bootstrap: 474.117s -> 473.781s (-0.07%)
Artifact size: 397.79 MiB -> 397.87 MiB (0.02%)

RalfJung and others added 16 commits November 30, 2025 14:25

thread::scope: document how join interacts with TLS destructors

1deb487

hir_owner_parent optimized to inlined call for non-incremental build

a5052a0

Part 2 refactoring of moving placeholder types to rustc_type_ir

25c1365

Rename, clarify, and document code for "erasing" query values

db74048

Use Rustc prefix for rustc attrs in AttributeKind

02bd3e8

Fix unused lint error in macro

87f75df

Treat unions as 'data types' in attr parsing diagnostics

b226583

Update askama version to 0.15.4

6397395

Rollup merge of rust-lang#150271 - Jamesbarford:chore/refactor-struct…

40d7cb8

…-placeholder-pt2, r=lcnr Move struct placeholder pt2 r? ghost

Rollup merge of rust-lang#151283 - chenyukang:yukang-fix-macro-unused…

adcdb6c

…, r=petrochenkov Suggest ignore returning value inside macro for unused_must_use lint Fixes rust-lang#151269 The first commit fix the original issue, the second commit is a code refactoring in this lint.

Rollup merge of rust-lang#151833 - clubby789:union-adt, r=JonathanBro…

eeb3a24

…uwer Treat unions as 'data types' in attr parsing diagnostics I found 'data types _and_ unions' to be a little surprising

Rollup merge of rust-lang#151834 - GuillaumeGomez:update-askama, r=Gu…

0f318f9

…illaumeGomez Update `askama` version to `0.15.4` Hopefully it's the last `askama` update before a while. ^^' r? ghost

rust-bors bot added the rollup A PR which is a rollup label Jan 29, 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 Jan 29, 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 Jan 29, 2026

rust-bors bot merged commit 842bd5b into rust-lang:main Jan 29, 2026
12 checks passed

rustbot added this to the 1.95.0 milestone Jan 29, 2026

github-actions bot mentioned this pull request Jan 30, 2026

Toolchain upgrade to nightly-2026-01-30 flux-rs/flux#1345

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests #151835

Rollup of 8 pull requests #151835

JonathanBrouwer commented Jan 29, 2026

Uh oh!

JonathanBrouwer commented Jan 29, 2026

Uh oh!

rust-bors bot commented Jan 29, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Jan 29, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 29, 2026

Uh oh!

github-actions bot commented Jan 29, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Jan 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Rollup of 8 pull requests #151835

Rollup of 8 pull requests #151835

Conversation

JonathanBrouwer commented Jan 29, 2026

Uh oh!

JonathanBrouwer commented Jan 29, 2026

Uh oh!

rust-bors bot commented Jan 29, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Jan 29, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 29, 2026

Uh oh!

github-actions bot commented Jan 29, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jan 29, 2026

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants