Skip to content

Rollup of 2 pull requests#150488

Merged
bors merged 24 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-9ugn7py
Dec 29, 2025
Merged

Rollup of 2 pull requests#150488
bors merged 24 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-9ugn7py

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@JonathanBrouwer JonathanBrouwer commented Dec 29, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

The Miri Cronjob Bot and others added 24 commits December 23, 2025 04:59
This updates the rust-version file to a0c97e3.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: a0c97e3
Filtered ref: d15082d6c7b5d3d982908060f41a59a144a1493c
Upstream diff: rust-lang/rust@cb79c42...a0c97e3

This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 8796b3b.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 8796b3b
Filtered ref: 642abedf8ad3d5b0e12c0d38ec35e365a34df07b
Upstream diff: rust-lang/rust@a0c97e3...8796b3b

This merge was created using https://github.com/rust-lang/josh-sync.
…tor-release-child-skipping

Tree Borrows: improve protector end access child skipping
This updates the rust-version file to 38ed770.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 38ed770
Filtered ref: 581f85c88ad421564634a8e45c53aed1f078099d
Upstream diff: rust-lang/rust@8796b3b...38ed770

This merge was created using https://github.com/rust-lang/josh-sync.
show a warning when combing native-lib mode and many-seeds
This updates the rust-version file to 23d01cd.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 23d01cd
Filtered ref: 8d207a46df39a5e19eeff773b2bed64e5ca8c44d
Upstream diff: rust-lang/rust@38ed770...23d01cd

This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 7fefa09.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 7fefa09
Filtered ref: 22e92bfe253dbac1f2e9f2501509aa94af530cb1
Upstream diff: rust-lang/rust@23d01cd...7fefa09

This merge was created using https://github.com/rust-lang/josh-sync.
fix ICE for particular data race situations
Accommodate LLVM PassPlugin rename

LLVM [recently moved](llvm/llvm-project#173279) their `PassPlugin` files to a new folder. This PR updates our `PassWrapper` to point to the new location.
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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. rollup A PR which is a rollup labels Dec 29, 2025
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Copy Markdown
Collaborator

bors commented Dec 29, 2025

📌 Commit 2c89d1c has been approved by JonathanBrouwer

It is now in the queue for this repository.

@bors 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 Dec 29, 2025
@bors
Copy link
Copy Markdown
Collaborator

bors commented Dec 29, 2025

⌛ Testing commit 2c89d1c with merge 56f24e0...

@bors
Copy link
Copy Markdown
Collaborator

bors commented Dec 29, 2025

☀️ Test successful - checks-actions
Approved by: JonathanBrouwer
Pushing 56f24e0 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2025
@bors bors merged commit 56f24e0 into rust-lang:main Dec 29, 2025
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 29, 2025
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#150394 Accommodate LLVM PassPlugin rename 67014702c6f3cff97920afdbf416c765924ebaab (link)
#150483 miri subtree update ff8434386b6176cafd82d53db83c15377de01113 (link)

previous master: 8cd58dd99d

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 8cd58dd (parent) -> 56f24e0 (this PR)

Test differences

Show 2 test diffs

2 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 56f24e00c62ec2db9a8b407e7aef532caaf71062 --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. tidy: 218.7s -> 167.5s (-23.4%)
  2. i686-gnu-2: 6642.5s -> 5336.2s (-19.7%)
  3. x86_64-rust-for-linux: 3220.8s -> 2603.8s (-19.2%)
  4. i686-gnu-nopt-1: 8753.4s -> 7480.2s (-14.5%)
  5. x86_64-gnu-gcc: 3537.2s -> 3037.2s (-14.1%)
  6. aarch64-gnu-llvm-20-1: 3791.4s -> 3260.0s (-14.0%)
  7. i686-gnu-1: 8666.6s -> 7475.7s (-13.7%)
  8. pr-check-2: 2670.7s -> 2305.9s (-13.7%)
  9. dist-aarch64-apple: 7706.5s -> 8699.4s (+12.9%)
  10. x86_64-gnu-distcheck: 8970.8s -> 7867.8s (-12.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 (56f24e0): 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 (primary 3.6%)

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

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

Binary size

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

Bootstrap: 483.86s -> 482.457s (-0.29%)
Artifact size: 390.85 MiB -> 390.83 MiB (-0.01%)

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

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants