Rollup of 7 pull requests by JonathanBrouwer · Pull Request #157064 · rust-lang/rust

JonathanBrouwer · 2026-05-28T12:59:47Z

Successful merges:

file locking: clarify that double-locking is underspecified #157046 (file locking: clarify that double-locking is underspecified)
rustdoc: deterministic sorting for doc_cfg badges #156401 (rustdoc: deterministic sorting for doc_cfg badges)
cg_llvm: Use LLVMDIBuilderCreateEnumeratorOfArbitraryPrecision #156746 (cg_llvm: Use LLVMDIBuilderCreateEnumeratorOfArbitraryPrecision)
Suggest function-local constructors without enclosing function path #156889 (Suggest function-local constructors without enclosing function path)
Fix missing note of escaping { for braces including whitespaces #157012 (Fix missing note of escaping { for braces including whitespaces)
Update Xtensa target data layouts to match upstream LLVM #157056 (Update Xtensa target data layouts to match upstream LLVM)
Add link to RFMF Sponsors page #157062 (Add link to RFMF Sponsors page)

and make it cover the specific difference between Windows and Unix

…r=Mark-Simulacrum file locking: clarify that double-locking is underspecified The 2nd commit fixes rust-lang#157045 by making the docs more clear.

…=GuillaumeGomez rustdoc: deterministic sorting for `doc_cfg` badges Fixes rust-lang#156391 Currently, target-exclusive `doc_cfg` badges (eg. "Available on...") reuse the order of predicates as they appear in the source code. This often buries popular targets behind niche ones and leads to inconsistent UI rendering. This PR introduces a deterministic sorting mechanism to the `Cfg` AST prior to HTML/JSON rendering. **Note for Reviewers:** To provide the best UX, I implemented a lightweight tiering heuristic (prioritizing major platforms like Linux/Apple/Windows first, followed by mobile, then BSDs, and alphabetizing the rest). However, I am completely open to tweaking these priority groupings or falling back to a different sorting logic if the team prefers. Let me know what you think!

cg_llvm: Use `LLVMDIBuilderCreateEnumeratorOfArbitraryPrecision` - Part of rust-lang#134001 - Follow-up to rust-lang#146763 --- This PR replaces our custom `LLVMRustDIBuilderCreateEnumerator` FFI binding with an equivalent LLVM-C binding to `LLVMDIBuilderCreateEnumeratorOfArbitraryPrecision`, which was introduced in LLVM 21. I have also added comments to the remaining `LLVMRustDIBuilder` functions explaining why they currently can't use an LLVM-C binding, and noted some other functions that can use LLVM-C bindings in the future.

…suggestion-144319, r=jieyouxu Suggest function-local constructors without enclosing function path Closes rust-lang#144319 This fixes a mismatched-type wrapper suggestion for constructors defined inside function-like scopes. The previous diagnostic used `def_path_str` directly, so a function-local tuple struct could be suggested as `main::Foo(false)`, even though `main` is not a module path that can name the constructor. The suggestion now prints the constructor path under rustc's existing suggestion printer mode. That mode omits path segments that cannot be written in source, while preserving real path segments such as local modules and enum names. The regression test covers: - a function-local tuple struct constructor - a function-local enum variant - a tuple struct inside a function-local module - a tuple struct inside a closure body - a tuple struct inside an inline const block

Fix missing note of escaping `{` for braces including whitespaces Fixes rust-lang#156868 Add note of escaping `{` for braces including whitespaces

@folkertdev

…=folkertdev Update Xtensa target data layouts to match upstream LLVM Born from rust-lang#156568 (comment). We've been using a fork to distribute compiler builds that support the Xtensa arch whilst we're upstreaming. At a certain point we received some changes on our fork, which haven't been upstreamed, which I now to believe to be a mistake - therefore I'm reverting to the upstream LLVM datalayout. r? @folkertdev

…acrum,jieyouxu Add link to RFMF Sponsors page To make the funding/sponsor link to RFMF and the Foundation's Sponsors page simpler.

JonathanBrouwer · 2026-05-28T12:59:55Z

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-2

rust-bors · 2026-05-28T12:59:58Z

📌 Commit 5cd06d1 has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 7 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-28T16:09:41Z

☀️ Try build successful (CI)
Build commit: 1a5d5d0 (1a5d5d0ba36b61c0a6e726b3ba72c767d7697b58, parent: b5e038d7158c1af55a646027fdacf5ecd7c783c7)

rust-bors · 2026-05-28T16:32:06Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 10m 41s
Pushing 8c1d720 to main...

rust-timer · 2026-05-28T16:34:16Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#156401	rustdoc: deterministic sorting for `doc_cfg` badges	`5f938d998357f2662743df17bc01a535d4c212f1` (link)
#156746	cg_llvm: Use `LLVMDIBuilderCreateEnumeratorOfArbitraryPreci…	`3fd6b5b6d60fedbb7cd797a1c371e72d466f1345` (link)
#156889	Suggest function-local constructors without enclosing funct…	`ebe3da1175479c9fa37df1404e9ea45aa552b8cc` (link)
#157012	Fix missing note of escaping `{` for braces including white…	`170ace4353d95a78d7e4284bee643d667c87d5a9` (link)
#157046	file locking: clarify that double-locking is underspecified	`e5eed1769a787424e1784f349af0be2f94bead77` (link)
#157056	Update Xtensa target data layouts to match upstream LLVM	`3cbdac5fadf96a110799affa88ad54c60d7c03c0` (link)
#157062	Add link to RFMF Sponsors page	`e0cbf1d8f764be3cc90fcb81d4e82f39efdd8ad1` (link)

previous master: b5e038d715

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-05-28T16:35:49Z

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 b5e038d (parent) -> 8c1d720 (this PR)

Test differences

Show 262 test diffs

Stage 1

[rustdoc-html] tests/rustdoc-html/doc-cfg/sort.rs: [missing] -> pass (J1)
[ui] tests/ui/suggestions/wrap-function-local-constructors.rs: [missing] -> pass (J1)
clean::cfg::tests::test_sort_for_rendering: [missing] -> pass (J2)
fs::tests::file_lock_double: [missing] -> pass (J4)

Stage 2

[ui] tests/ui/suggestions/wrap-function-local-constructors.rs: [missing] -> pass (J0)
fs::tests::file_lock_double: [missing] -> pass (J3)
fs::tests::file_lock_double_unlock: pass -> [missing] (J5)
[rustdoc-html] tests/rustdoc-html/doc-cfg/sort.rs: [missing] -> pass (J6)

Additionally, 254 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 8c1d72083bb2b7b9df8cbbf06a57d240a007bd85 --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-android: 19m 32s -> 29m 26s (+50.7%)
optional-x86_64-gnu-parallel-frontend: 1h 52m -> 2h 49m (+50.0%)
x86_64-gnu-gcc-core-tests: 7m 51s -> 11m 18s (+43.9%)
pr-check-1: 25m 2s -> 35m 5s (+40.1%)
x86_64-msvc-ext1: 1h 44m -> 2h 17m (+31.2%)
dist-i686-linux: 1h 49m -> 1h 27m (-19.8%)
dist-armhf-linux: 1h 12m -> 1h 25m (+19.1%)
dist-powerpc64-linux-gnu: 1h 54m -> 1h 33m (-18.8%)
x86_64-gnu-llvm-22-1: 1h 8m -> 1h 20m (+18.6%)
aarch64-gnu-llvm-21-2: 36m 7s -> 42m 42s (+18.2%)

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-28T17:51:17Z

Finished benchmarking commit (8c1d720): 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
Improvements ✅ (secondary)	-0.5%	[-0.5%, -0.5%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 15.3%)

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

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

Cycles

Results (primary 2.4%, secondary -2.2%)

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

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

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 512.125s -> 514.855s (0.53%)
Artifact size: 400.67 MiB -> 400.72 MiB (0.01%)

onehr and others added 17 commits May 27, 2026 18:16

Suggest function-local constructors without enclosing function path

0276d9f

fix: missing note of escaping { for whitespaces.

e2521e6

Use LLVMDIBuilderCreateEnumeratorOfArbitraryPrecision

c8449aa

Explain why the remaining debuginfo bindings don't use LLVM-C

12ad5b7

Note some bindings that can be replaced after dropping LLVM 21 support

d59cae8

enable file_lock_double_unlock test on Unix targets as well

a3b8240

and make it cover the specific difference between Windows and Unix

make file locking docs a bit more clear

2c1d605

rustdoc: deterministic sorting for doc_cfg badges

f658bf6

Update Xtensa target data layouts to match upstream LLVM changes

d061e0b

Add link to RFMF Sponsors page

840b3ce

Rollup merge of rust-lang#157046 - RalfJung:file_lock_double_unlock, …

22f9a1d

…r=Mark-Simulacrum file locking: clarify that double-locking is underspecified The 2nd commit fixes rust-lang#157045 by making the docs more clear.

Rollup merge of rust-lang#157012 - Kokoro2336:fix/issue-156868, r=mejrs

b03615b

Fix missing note of escaping `{` for braces including whitespaces Fixes rust-lang#156868 Add note of escaping `{` for braces including whitespaces

Rollup merge of rust-lang#157062 - Kobzol:sponsors-link, r=Mark-Simul…

5cd06d1

…acrum,jieyouxu Add link to RFMF Sponsors page To make the funding/sponsor link to RFMF and the Foundation's Sponsors page simpler.

rust-bors Bot added the rollup A PR which is a rollup label May 28, 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 May 28, 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 28, 2026

rust-bors Bot merged commit 8c1d720 into rust-lang:main May 28, 2026
14 checks passed

rustbot added this to the 1.98.0 milestone May 28, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#157064

Rollup of 7 pull requests#157064
rust-bors[bot] merged 17 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-BDFNumV

JonathanBrouwer commented May 28, 2026

Uh oh!

JonathanBrouwer commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

Uh oh!

rust-timer commented May 28, 2026

Uh oh!

github-actions Bot commented May 28, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented May 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

JonathanBrouwer commented May 28, 2026

Uh oh!

JonathanBrouwer commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

Uh oh!

rust-timer commented May 28, 2026

Uh oh!

github-actions Bot commented May 28, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented May 28, 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