Skip to content

Rollup of 6 pull requests - #150481

Merged
bors merged 15 commits into
rust-lang:mainfrom
matthiaskrgr:rollup-f5b2wkm
Dec 29, 2025
Merged

Rollup of 6 pull requests#150481
bors merged 15 commits into
rust-lang:mainfrom
matthiaskrgr:rollup-f5b2wkm

Conversation

@matthiaskrgr

@matthiaskrgrmatthiaskrgr commented Dec 29, 2025•
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ZuseZ4and others added 15 commits December 22, 2025 11:18
@ZuseZ4
add new configure_cmake option to let projects set cc/cxx flags
e8a6312
@ZuseZ4
Change how we build offload as a single Step
f3b16d8
@hkBst
cleanup slice iter 2
16b219a
@RalfJung
fix running doctests in Miri
391c819
@RalfJung
disable a doctests that does not work yet
a4b4cd5
@el-ev
Fix enum variant suggestion consuming trailing parenthesis
a3c816a
@Kobzol
Fix new bors config
19c8ea4
@ZuseZ4
add has_offload/needs-offload to the test infra
7ee7d44
@ZuseZ4
document the needs-enzyme flag
6e0b610
@matthiaskrgr
Rollup merge ofrust-lang#150108- ZuseZ4:offload-build-rework, r=Kobzol
f67b020
Offload: Build offload as a single Step
r? `@Kobzol`
Since it looks like we'll postpone enabling offload in CI for a bit, I factored out these improvements which we want independently. I locally tested both build options successfully, the in-tree-clang build, as well as the build where we provide a path to an external clang.
@matthiaskrgr
Rollup merge ofrust-lang#150262- hkBst:slice-iter-2, r=joboet
9de01a8
slice iter cleanup: replace checked_sub with saturating_sub
Continuation of rust-lang#146436
r? `@joboet`
@matthiaskrgr
Rollup merge ofrust-lang#150427- ZuseZ4:offload-testinfra, r=jieyouxu
19907e6
add has_offload/needs-offload to the test infra
unblocks: rust-lang#150426
Mostly copied from rust-lang#131044
lmk if some of these changes should land separately?
r? jieyouxu
@matthiaskrgr
Rollup merge ofrust-lang#150458- RalfJung:miri-doctests, r=bjorn3
fc8230f
fix running stdlib doctests in Miri in CI
r? `@bjorn3`
@matthiaskrgr
Rollup merge ofrust-lang#150477- el-ev:issue150459, r=Urgau
72f53d8
Fix enum variant suggestion consuming trailing parenthesis
- Closesrust-lang#150459
Previously the logic incorrectly assumed the variant itself was the function being called when the parent node was a function all. This change adds a check to ensure the replacement span is only expanded if the path expression is actually the callee of the parent expression.
@matthiaskrgr
Rollup merge ofrust-lang#150478- Kobzol:bors-config, r=jieyouxu
3748bde
Fix new bors config
I added the root config under `[labels]` by accident, so it failed to be deserialized by bors.
@rustbotrustbot added A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler 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. rollup A PR which is a rollup labels Dec 29, 2025
@matthiaskrgr

matthiaskrgr commented Dec 29, 2025

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Dec 29, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 3748bde has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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

bors commented Dec 29, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3748bde with merge 7e7280f...

@bors

bors commented Dec 29, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 7e7280f to main...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2025
@bors
bors merged commit 7e7280f into rust-lang:mainDec 29, 2025
12 checks passed
@rustbotrustbot added this to the 1.94.0 milestone Dec 29, 2025
@rust-timer

rust-timer commented Dec 29, 2025

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#150108Offload: Build offload as a single Step285b23709fa16a88a8edb55cb2567f0681c4c043 (link)
#150262slice iter cleanup: replace checked_sub with saturating_sub9024e0a3eacd019ed7b6741026090d7470a40d25 (link)
#150427add has_offload/needs-offload to the test infra5f649440ee19c1c8a63d00b4a1f2aef2b1447ac4 (link)
#150458fix running stdlib doctests in Miri in CI867c73348b0f5337b2432374e50692597a0f7951 (link)
#150477Fix enum variant suggestion consuming trailing parenthesis866f877af2de46f5bfff79dfe7d2509585c546fa (link)
#150478Fix new bors config88666e8b4e2218e9de82714840bf43249d03e768 (link)

previous master: a1bb9103b0

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

github-actionsBot commented Dec 29, 2025

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 a1bb910 (parent) -> 7e7280f (this PR)

Test differences

Show 5596 test diffs

5596 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 7e7280f24bffbee05da618fb8e7420d8f788213f --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. dist-aarch64-linux: 6547.7s -> 9150.3s (+39.7%)
  2. dist-x86_64-llvm-mingw: 6586.9s -> 7296.1s (+10.8%)
  3. x86_64-gnu-llvm-21-2: 5514.4s -> 4944.9s (-10.3%)
  4. dist-aarch64-msvc: 5788.5s -> 5199.5s (-10.2%)
  5. dist-aarch64-llvm-mingw: 6173.1s -> 6754.9s (+9.4%)
  6. x86_64-gnu-distcheck: 7871.8s -> 7229.2s (-8.2%)
  7. tidy: 174.2s -> 160.2s (-8.0%)
  8. x86_64-gnu-aux: 6628.1s -> 7137.4s (+7.7%)
  9. x86_64-msvc-1: 9289.0s -> 8582.4s (-7.6%)
  10. aarch64-gnu-debug: 3923.9s -> 4197.3s (+7.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

rust-timer commented Dec 29, 2025

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (7e7280f): 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)

Results (secondary 2.8%)

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

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		2.8%[2.8%, 2.8%]1
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		--0
All ❌✅ (primary)--0

Cycles

Results (secondary 2.4%)

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

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		2.4%[2.4%, 2.4%]1
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		--0
All ❌✅ (primary)--0

Binary size

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

Bootstrap: 482.459s -> 483.218s (0.16%)
Artifact size: 390.85 MiB -> 390.84 MiB (-0.00%)

This was referenced Dec 29, 2025
Closed
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-compiletestArea: The compiletest test runnerA-rustc-dev-guideArea: rustc-dev-guideA-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.94.0

Development

Successfully merging this pull request may close these issues.

9 participants

@matthiaskrgr@bors@rust-timer@rustbot@ZuseZ4@hkBst@RalfJung@el-ev@Kobzol