Rollup of 5 pull requests by JonathanBrouwer · Pull Request #157863 · rust-lang/rust

JonathanBrouwer · 2026-06-13T14:50:27Z

Successful merges:

Add xdg_basedir API #157518 (Add xdg_basedir API)
Rename errors.rs file to diagnostics.rs (6/N) #157752 (Rename errors.rs file to diagnostics.rs (6/N))
Match expressions had not been updated to also show the match_source,… #157769 (Match expressions had not been updated to also show the match_source,…)
Emit retags in codegen to support BorrowSanitizer (part 3) #157825 (Emit retags in codegen to support BorrowSanitizer (part 3))
Rename errors.rs file to diagnostics.rs (7/N) #157861 (Rename errors.rs file to diagnostics.rs (7/N))

… since the time that was added update existing match tests as well remove hashes from output remove specific DefIds for core from output remove additional specifics that can vary and which are not relevant to the test

…c/diagnostics.rs`

…nostics.rs`

…agnostics.rs`

Add xdg_basedir API Implements an API providing easy access to the XDG Base Directories. I chose to defer `runtime_dir` (`XDG_RUNTIME_DIR`) since the lack of a specified default (but specified expectation for applications to determine an alternative option somehow) makes the correct usage (and thus ideal API) less obvious. - Accepted ACP: rust-lang/libs-team#805 - Tracking issue: rust-lang#157515

@JonathanBrouwer

…3, r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (6/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer

…rce, r=Nadrieril Match expressions had not been updated to also show the match_source,… … since the time that was added

@RalfJung

…-3, r=saethlin Emit retags in codegen to support BorrowSanitizer (part 3) Tracking issue: rust-lang#154760 [Zulip Thread](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Staging.20for.20emitting.20retags.20in.20codegen/with/593004012) This is one of several PRs that will add experimental support for emitting retags as function calls in codegen. This PR adds `RetagPlan`, which describes where the pointers that need to be retagged live within the layout of a type. We create a `RetagPlan` ahead of time because only a subset of the variants of a type might contain retagable values. We only want to branch to these variants, and ignore all of the others. If a type can generate a `RetagPlan`, then we will use it as a guide for inserting calls to our retag intrinsics. If a type does not generate a `RetagPlan`, then it does not need to be retagged, and we can skip it. This does not emit a `RetagPlan::EmitRetag` yet. That will come in a subsequent PR. Previous parts: rust-lang#156208, rust-lang#156210 cc: @RalfJung r? @saethlin

@JonathanBrouwer

… r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (7/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer

JonathanBrouwer · 2026-06-13T14:50:51Z

@bors r+ rollup=never p=5

rust-bors · 2026-06-13T14:50:54Z

📌 Commit 6b8ad08 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rust-bors · 2026-06-13T18:03:51Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 12m 16s
Pushing e7ef22d to main...

rust-timer · 2026-06-13T18:05:21Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#157518	Add xdg_basedir API	`b200c50e27e6dd9ddbb4ed152311b2fc9cb3066c` (link)
#157752	Rename `errors.rs` file to `diagnostics.rs` (6/N)	`5155e95acdcc47e0bb618581e1bd85213f2c4d04` (link)
#157769	Match expressions had not been updated to also show the mat…	`920de1a0de2ca867a227a0e5e4cbe36fc11d8e7c` (link)
#157825	Emit retags in codegen to support BorrowSanitizer (part 3)	`d84f38db8276f663fa254e5f5539211c79dd1fe9` (link)
#157861	Rename `errors.rs` file to `diagnostics.rs` (7/N)	`72585acee56af7189f0dc079fb3d6bdffb1accf3` (link)

previous master: 8d6b38095e

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-06-13T18:07:26Z

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 8d6b380 (parent) -> e7ef22d (this PR)

Test differences

Show 39 test diffs

Stage 1

[ui] tests/ui/thir-print/thir-tree-match-for.rs: [missing] -> pass (J0)
[ui (polonius)] tests/ui/thir-print/thir-tree-match-for.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/thir-print/thir-tree-match-for.rs: [missing] -> pass (J2)

Additionally, 36 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 e7ef22d23f10e9e05546592aa9c1e3e8bb288969 --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: 28m 41s -> 18m 26s (-35.8%)
x86_64-gnu-gcc-core-tests: 9m 27s -> 12m 26s (+31.6%)
i686-msvc-1: 2h 21m -> 3h 2m (+28.9%)
dist-i686-msvc: 2h 27m -> 1h 45m (-28.4%)
x86_64-gnu-llvm-21-3: 1h 32m -> 1h 55m (+24.2%)
dist-x86_64-illumos: 1h 50m -> 1h 24m (-23.2%)
pr-check-1: 25m 19s -> 30m 37s (+20.9%)
x86_64-gnu-distcheck: 2h 23m -> 1h 53m (-20.5%)
i686-msvc-2: 2h 5m -> 1h 41m (-19.1%)
dist-apple-various: 1h 27m -> 1h 43m (+18.4%)

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-06-14T00:44:27Z

Finished benchmarking commit (e7ef22d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -3.5%, secondary -0.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)	-	-	0
Improvements ✅ (primary)	-3.5%	[-6.4%, -0.6%]	2
Improvements ✅ (secondary)	-0.9%	[-0.9%, -0.9%]	1
All ❌✅ (primary)	-3.5%	[-6.4%, -0.6%]	2

Cycles

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

Binary size

Results (primary 0.1%, secondary 0.1%)

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

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.0%, 0.1%]	43
Regressions ❌ (secondary)	0.1%	[0.0%, 0.2%]	27
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.0%, 0.1%]	43

Bootstrap: 517.524s -> 521.088s (0.69%)
Artifact size: 400.85 MiB -> 401.44 MiB (0.15%)

CAD97 and others added 18 commits June 5, 2026 23:14

Add xdg_basedir API

073e649

update module doc comment after review

9534d0f

reword xdg::cache_home_dir doc per review

2b3d273

remove unnecessary helper generics

7b46306

reduce byte shuffling in XdgDirsIter

593a847

remove unused import

6e670de

Remove redundant word in doc comment

378da80

Added initial support for building a RetagPlan.

dea3ed8

Rename rustc_hir_analysis/src/errors.rs into `rustc_hir_analysis/sr…

f6e99c1

…c/diagnostics.rs`

Rename rustc_infer/src/errors.rs into rustc_infer/src/diagnostics.rs

579cac2

Rename rustc_interface/src/errors.rs into `rustc_interface/src/diag…

d4b2610

…nostics.rs`

Rename rustc_hir_typeck/src/errors.rs into `rustc_hir_typeck/src/di…

190a22d

…agnostics.rs`

Rollup merge of rust-lang#157752 - GuillaumeGomez:rename-err-to-diag-…

04724ff

…3, r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (6/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer

Rollup merge of rust-lang#157769 - AlexCeleste:thir-missing-match-sou…

f889de2

…rce, r=Nadrieril Match expressions had not been updated to also show the match_source,… … since the time that was added

Rollup merge of rust-lang#157861 - GuillaumeGomez:rename-err-to-diag,…

6b8ad08

… r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (7/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer

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

rust-bors Bot mentioned this pull request Jun 13, 2026

Add xdg_basedir API #157518

Merged

This comment has been minimized.

Sign in to view

rust-bors Bot added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2026

rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 13, 2026

rust-bors Bot merged commit e7ef22d into rust-lang:main Jun 13, 2026
14 checks passed

rustbot added this to the 1.98.0 milestone Jun 13, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests#157863

Rollup of 5 pull requests#157863
rust-bors[bot] merged 18 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-YNzUbyz

JonathanBrouwer commented Jun 13, 2026

Uh oh!

JonathanBrouwer commented Jun 13, 2026

Uh oh!

rust-bors Bot commented Jun 13, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 13, 2026

Uh oh!

Uh oh!

rust-timer commented Jun 13, 2026

Uh oh!

github-actions Bot commented Jun 13, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Jun 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

JonathanBrouwer commented Jun 13, 2026

Uh oh!

JonathanBrouwer commented Jun 13, 2026

Uh oh!

rust-bors Bot commented Jun 13, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 13, 2026

Uh oh!

Uh oh!

rust-timer commented Jun 13, 2026

Uh oh!

github-actions Bot commented Jun 13, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jun 14, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants