Rollup of 9 pull requests #143254

matthiaskrgr · 2025-06-30T18:49:46Z

Successful merges:

Ensure -V --verbose processes both codegen_backend and codegen-backend #143019 (Ensure -V --verbose processes both codegen_backend and codegen-backend)
give Pointer::into_parts a more scary name and offer a safer alternative #143140 (give Pointer::into_parts a more scary name and offer a safer alternative)
Make combining LLD with external LLVM config a hard error #143175 (Make combining LLD with external LLVM config a hard error)
Use tracing-forest instead of tracing-tree for bootstrap tracing #143180 (Use tracing-forest instead of tracing-tree for bootstrap tracing)
Improve macro stats printing #143223 (Improve macro stats printing)
Handle build scripts better in -Zmacro-stats output. #143228 (Handle build scripts better in -Zmacro-stats output.)
[COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary #143229 ([COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary)
Subtree update of rust-analyzer #143246 (Subtree update of rust-analyzer)
Update books #143248 (Update books)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…and faster string parsing

…have the right type

minor: sync from downstream

fix: Fix cargo project manifest not pointing to the workspace root

…iene fix: Use `ROOT` hygiene for `args` inside new `format_args!` expansion

And one frequently asked question.

docs: Add troubleshooting FAQ to the book

…ning test(s) or bin at keyboard cursor

fix: Respect `.cargo/config.toml` `build.target-dir`

minor: Don't run doctests

We lack trait object default lifetime elision, so `'static` can be wrong at times, confusing the user

Do not default to 'static for trait object lifetimes

Document sysroot_project field in rust-project.json

fix: In "Wrap return type" assist, don't wrap exit points if they already have the right type

Cleanup `folding_ranges` and support more things

Update to literal-escaper 0.0.4

…update main.createCommands instead

Short circuit a couple hir-ty/lower queries

Use `tracing-forest` instead of `tracing-tree` for bootstrap tracing I find the `tracing-forest` output easier to comprehend. Note that this is not a strict improvement -- `tracing-forest` output contains some emojis and redundant log levels, but customizing it seems to be... non-trivial. Despite this, I still find `tracing-forest` easier to follow than `tracing-tree`, even when I tried to tune `tracing-tree` output. ### Preview ```bash BOOTSTRAP_TRACING=debug ./x test library/std --dry-run ``` With `tracing-forest` (this PR), it looks like ![Screenshot 2025-06-29 174802](https://github.com/user-attachments/assets/1ab9150f-48f8-4fb3-b004-27bcf8bbc0f5) With `tracing-tree` (before this PR), it looked like ![Screenshot 2025-06-29 175227](https://github.com/user-attachments/assets/659e254d-15ab-47dd-af11-98e2331d4d7a) r? `@Kobzol`

…inting, r=petrochenkov Improve macro stats printing Fix a small formatting issue that has been annoying me. r? ``@petrochenkov``

…pts, r=Kobzol Handle build scripts better in `-Zmacro-stats` output. Currently all build scripts are listed as `build_script_build` in the stats header. This commit uses `CARGO_PKG_NAME` to improve that. I tried it on Bevy, it works well, giving output like this on the build script: ``` MACRO EXPANSION STATS: serde build script ``` and this on the crate itself: ``` MACRO EXPANSION STATS: serde ``` r? `@Kobzol`

…, r=Kobzol [COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary This is part of a patch series to untangle `compiletest` to hopefully nudge it towards being more maintainable. This PR: - Moves some early config checks (some warnings) to the compiletest library. - Moves `src/main.rs` to `src/bin/main.rs` to make the separation (as in, compiletest's library component vs the tool binary component) more obvious. r? ``@Kobzol`` (or reroll)

Subtree update of `rust-analyzer` r? ``@ghost``

Update books ## rust-lang/book 2 commits in 8a6d44e45b7b564eeb6bae30507e1fbac439d72d..ef1ce8f87a8b18feb1b6a9cf9a4939a79bde6795 2025-06-28 18:06:08 UTC to 2025-06-26 23:08:19 UTC - Chapter 14 from tech review (rust-lang/book#4423) - Chapter 13 from tech review (rust-lang/book#4421) ## rust-embedded/book 1 commits in 10fa1e084365f23f24ad0000df541923385b73b6..41f688a598a5022b749e23d37f3c524f6a0b28e1 2025-06-27 07:21:31 UTC to 2025-06-27 07:21:31 UTC - Fix incorrect type for semihosted stdout stream rust-lang#394 (rust-embedded/book#395) ## rust-lang/reference 4 commits in 50fc1628f36563958399123829c73755fa7a8421..e9fc99f107840813916f62e16b3f6d9556e1f2d8 2025-06-28 20:00:14 UTC to 2025-06-24 19:02:48 UTC - fix: swap places for 2 words in associated-items.md sentence. (rust-lang/reference#1871) - Add new temporary lifetime extension rule (rust-lang/reference#1813) - Fix smart punctuation inside grammar terminals (rust-lang/reference#1869) - Fix placement of codegen link definitions (rust-lang/reference#1868) ## rust-lang/rust-by-example 1 commits in 05c7d8bae65f23a1837430c5a19be129d414f5ec..288b4e4948add43f387cad35adc7b1c54ca6fe12 2025-06-25 12:35:59 UTC to 2025-06-25 12:35:59 UTC - allow easy fixes (rust-lang/rust-by-example#1941)

matthiaskrgr · 2025-06-30T18:50:05Z

@bors r+ rollup=never p=5

bors · 2025-06-30T18:50:08Z

📌 Commit 3f6dc54 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-06-30T22:36:57Z

⌛ Testing commit 3f6dc54 with merge fdad98d...

bors · 2025-07-01T02:20:28Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing fdad98d to master...

rust-timer · 2025-07-01T02:23:04Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#143019	Ensure -V --verbose processes both codegen_backend and code…	`4e668893de2cc993b599ae6086480ed9a411ae96` (link)
#143140	give Pointer::into_parts a more scary name and offer a safe…	`a00b977c578f0cf5b698ce8c378edb39c9f5aa6d` (link)
#143175	Make combining LLD with external LLVM config a hard error	`47d7c9d1869f5a2256dbad1f3bfbbcf276fd6df0` (link)
#143180	Use `tracing-forest` instead of `tracing-tree` for bootstra…	`674cad44798d46c466bb2574a1f63e902e951428` (link)
#143223	Improve macro stats printing	`385d8dd1806278ce7cf5d9974a492530153a5e2a` (link)
#143228	Handle build scripts better in `-Zmacro-stats` output.	`19a9992802e84204a97c245def484fbe4ab221de` (link)
#143229	[COMPILETEST-UNTANGLE 1/N] Move some some early config chec…	`405336eb27f74fee3c9d827bee3510a6a0ede35b` (link)
#143246	Subtree update of `rust-analyzer`	`a9ac6ded48f3cf90b04b82194c25ddc45466800c` (link)
#143248	Update books	`1981bc7d0510ba6cc7a2a212093e85b2d4043351` (link)

previous master: f26e580230

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 · 2025-07-01T02:23:05Z

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 f26e580 (parent) -> fdad98d (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard fdad98d7463eebcdca94716ec3036c38a8d66f50 --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

aarch64-apple: 4794.3s -> 7219.8s (50.6%)
x86_64-apple-1: 5908.1s -> 7674.3s (29.9%)
dist-aarch64-apple: 6297.4s -> 5224.4s (-17.0%)
i686-gnu-2: 5384.6s -> 6097.0s (13.2%)
x86_64-gnu-tools: 3235.8s -> 3658.3s (13.1%)
aarch64-gnu-debug: 3521.6s -> 3960.9s (12.5%)
i686-gnu-1: 7379.6s -> 8237.4s (11.6%)
x86_64-gnu-llvm-19-1: 3389.9s -> 3778.7s (11.5%)
mingw-check-1: 1558.2s -> 1730.6s (11.1%)
dist-armv7-linux: 5274.5s -> 4798.5s (-9.0%)

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 · 2025-07-01T05:46:18Z

Finished benchmarking commit (fdad98d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

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)	4.6%	[4.0%, 5.7%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.9%	[-2.7%, -0.4%]	8
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 696.724s -> 695.288s (-0.21%)
Artifact size: 372.22 MiB -> 372.25 MiB (0.01%)

hkBst and others added 30 commits June 16, 2025 15:12

update to literal-escaper 0.0.4 for better API without unreachable …

de5c506

…and faster string parsing

Format goto_type_definition

74e92a8

In "Wrap return type" assist, don't wrap exit points if they already …

47b29ea

…have the right type

Don't run doctests

a78bc7c

Preparing for merge from rust-lang/rust

3db7cff

Merge from rust-lang/rust

3c4a690

Document sysroot_project field in rust-project.json

18855c9

Merge pull request rust-lang#20063 from lnicola/sync-from-rust

4b37534

minor: sync from downstream

fix: Fix cargo project manifest not pointing to the workspace root

d0ebff0

Merge pull request rust-lang#20069 from Veykril/push-mnqkqxomtlxn

6c3a870

fix: Fix cargo project manifest not pointing to the workspace root

fix: Use ROOT hygiene for args inside new format_args! expansion

b3c7913

Merge pull request rust-lang#20073 from ShoyuVanilla/fix-fmt-args-hyg…

dd142e4

…iene fix: Use `ROOT` hygiene for `args` inside new `format_args!` expansion

fix: Respect .cargo/config.toml build.target-dir

c37994c

Add troubleshooting FAQ to the book

e40aa42

And one frequently asked question.

Merge pull request rust-lang#20076 from ChayimFriedman2/faq

c751049

docs: Add troubleshooting FAQ to the book

feat: Extend vscode 'run' command with optional mode argument for run…

98e7b94

…ning test(s) or bin at keyboard cursor

Merge pull request rust-lang#20072 from Veykril/push-sorvvvzskywv

7ce7c2e

fix: Respect `.cargo/config.toml` `build.target-dir`

Merge pull request rust-lang#20062 from ChayimFriedman2/doctests

c30af1b

minor: Don't run doctests

Do not default to 'static for trait object lifetimes

1d3b517

We lack trait object default lifetime elision, so `'static` can be wrong at times, confusing the user

Merge pull request rust-lang#20036 from Veykril/push-yquvoyrxkksx

bb164bf

Do not default to 'static for trait object lifetimes

Merge pull request rust-lang#20064 from Wilfred/document_sysroot_project

04c9089

Document sysroot_project field in rust-project.json

Merge pull request rust-lang#20061 from ChayimFriedman2/wrap-ret-ty

e8388b0

fix: In "Wrap return type" assist, don't wrap exit points if they already have the right type

Cleanup folding_ranges and support more things

40aeda9

Merge pull request rust-lang#20080 from Veykril/push-vnrwqppplykm

1fffcff

Cleanup `folding_ranges` and support more things

Merge pull request rust-lang#20012 from lnicola/bump-literal-escaper

0b648f8

Update to literal-escaper 0.0.4

Remove special casing in command factory (revert changes in ctx.ts), …

7eb776e

…update main.createCommands instead

ci: Fix cancel parallel jobs on windows

18e008b

Short circuit a couple hir-ty/lower queries

8b52bab

Merge pull request rust-lang#20087 from Veykril/push-rrtkwpzmmwwz

6968130

Short circuit a couple hir-ty/lower queries

Fix link in the book

abb956b

matthiaskrgr added 6 commits June 30, 2025 20:49

Rollup merge of rust-lang#143223 - nnethercote:improve-macro-stats-pr…

172fc60

…inting, r=petrochenkov Improve macro stats printing Fix a small formatting issue that has been annoying me. r? ``@petrochenkov``

Rollup merge of rust-lang#143246 - lnicola:sync-from-ra, r=lnicola

6d41b34

Subtree update of `rust-analyzer` r? ``@ghost``

bors 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 30, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 1, 2025

bors merged commit fdad98d into rust-lang:master Jul 1, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 1, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 9 pull requests #143254

Rollup of 9 pull requests #143254

Uh oh!

matthiaskrgr commented Jun 30, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Jun 30, 2025

Uh oh!

bors commented Jun 30, 2025

Uh oh!

bors commented Jun 30, 2025

Uh oh!

bors commented Jul 1, 2025

Uh oh!

Uh oh!

rust-timer commented Jul 1, 2025

Uh oh!

github-actions bot commented Jul 1, 2025

Uh oh!

rust-timer commented Jul 1, 2025

Uh oh!

Uh oh!

Rollup of 9 pull requests #143254

Rollup of 9 pull requests #143254

Uh oh!

Conversation

matthiaskrgr commented Jun 30, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Jun 30, 2025

Uh oh!

bors commented Jun 30, 2025

Uh oh!

bors commented Jun 30, 2025

Uh oh!

bors commented Jul 1, 2025

Uh oh!

Uh oh!

rust-timer commented Jul 1, 2025

Uh oh!

github-actions bot commented Jul 1, 2025

Test differences

Job duration changes

Uh oh!

rust-timer commented Jul 1, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

matthiaskrgr commented Jun 30, 2025 •

edited by rustbot

Loading