Skip to content

Rollup of 3 pull requests#156728

Merged
rust-bors[bot] merged 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Qv3EfnO
May 19, 2026
Merged

Rollup of 3 pull requests#156728
rust-bors[bot] merged 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Qv3EfnO

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

lqd and others added 8 commits May 8, 2026 20:59
We need it to be able to build the stdlib, and this has regressed
in the recent past.
test new solver on CI until stabilization

We need the new solver to be able to build the stdlib, and this has regressed in the recent past. Things are broken right now, and we want to ensure this keeps working until stabilization later this year.

I've added this to the `x86_64-gnu-llvm-XX` job (note no `-1/2/3` suffix) so it's run on PR and auto CI, and because it's roughly the fastest of these builders, though maybe the aarch64 llvm 1 and 2 are slightly faster.

Building the stage 1 `./x build library/` is generally quite quick, a couple minutes at most.

The new solver fix to build std is from @lcnr [on zulip](https://rust-lang.zulipchat.com/#narrow/channel/364551-t-types.2Ftrait-system-refactor/topic/weekly.20sync.2Fupdates/near/591998234).
r? @marcoieni
…rfonthey

prefer `T::IS_ZST` over manual check

makes the intent clearer and possible small perf improvement
Update books

## rust-lang/reference

9 commits in 581920f9109f141b88b860b3e1e8359e3896a150..ad35aca481751a06afeb23820a672b0f3b11a476
2026-05-14 17:00:42 UTC to 2026-05-04 18:27:13 UTC

- ci: declare contents:read on CI workflow (rust-lang/reference#2271)
- Fix the grammar of generic arguments (rust-lang/reference#2247)
- Rename grammar rule `TypeParamBounds` to just `Bounds` (rust-lang/reference#2258)
- Update `used` to use the attribute template (rust-lang/reference#1905)
- Place HRTB binders before fn qualifiers (rust-lang/reference#2260)
- Glossary: add new entry documenting zero-sized types (rust-lang/reference#2203)
- Fix test failure on macOS with link_section (rust-lang/reference#2246)
- Make definition of fragment specifier `path` more precise (rust-lang/reference#2248)
- gitignore linkcheck (rust-lang/reference#2252)
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 18, 2026
@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 18, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 18, 2026

📌 Commit 0cb7361 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors 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 18, 2026
@rust-bors

This comment has been minimized.

@rust-bors 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 19, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 19, 2026

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

@rust-bors rust-bors Bot merged commit ca9203f into rust-lang:main May 19, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 19, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#155840 prefer T::IS_ZST over manual check 405f121221cba76672f21c0b834b347d67cc9a6a (link)
#156146 test new solver on CI until stabilization a40bda53311a025bde4c135e0a642d0f3a66cbcc (link)
#156723 Update books f8cef1eff373f56e7db9ac03c4b879c9a833bb3b (link)

previous master: 9eb3be26b4

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
Copy link
Copy Markdown
Contributor

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 9eb3be2 (parent) -> ca9203f (this PR)

Test differences

Show 16 test diffs

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

Test dashboard

Run

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

  1. pr-check-1: 44m 2s -> 32m 43s (-25.7%)
  2. dist-x86_64-illumos: 1h 28m -> 1h 47m (+20.6%)
  3. dist-various-2: 44m 55s -> 35m 40s (-20.6%)
  4. dist-powerpc64-linux-gnu: 1h 16m -> 1h 32m (+20.6%)
  5. dist-i686-msvc: 2h 25m -> 1h 56m (-20.1%)
  6. dist-powerpc-linux: 1h 16m -> 1h 31m (+19.3%)
  7. dist-aarch64-apple: 2h 21m -> 1h 55m (-18.3%)
  8. dist-apple-various: 2h 3m -> 1h 43m (-16.7%)
  9. x86_64-gnu-llvm-21-2: 1h 27m -> 1h 40m (+15.1%)
  10. dist-x86_64-apple: 2h 19m -> 2h 1m (-13.3%)
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
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (ca9203f): 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.1% [-0.1%, -0.1%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.3%, secondary -4.9%)

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

mean range count
Regressions ❌
(primary)
2.0% [1.3%, 2.8%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.2% [-3.2%, -3.2%] 1
Improvements ✅
(secondary)
-4.9% [-4.9%, -4.9%] 1
All ❌✅ (primary) 0.3% [-3.2%, 2.8%] 3

Cycles

Results (secondary 4.4%)

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.4% [2.4%, 7.0%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 510.171s -> 513.992s (0.75%)
Artifact size: 398.52 MiB -> 400.62 MiB (0.53%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants