Skip to content

Rollup of 3 pull requests#143496

Merged
bors merged 6 commits intorust-lang:masterfrom
saethlin:rollup-4u43rgj
Jul 5, 2025
Merged

Rollup of 3 pull requests#143496
bors merged 6 commits intorust-lang:masterfrom
saethlin:rollup-4u43rgj

Conversation

@saethlin
Copy link
Member

@saethlin saethlin commented Jul 5, 2025 •
edited by rustbot
Loading

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

folkertdev and others added 6 commits July 5, 2025 09:18
@folkertdev
move the va_copy, va_arg and va_end to core::intrinsics
4ae22fb
@jieyouxu
Improve compiletest config documentation
7405e2a 
Including a bunch of FIXMEs.
@RalfJung
codegen_ssa: replace a Result by an Either
3cd13f7
@saethlin
Rollup merge of rust-lang#143291 - RalfJung:result-isnt-either, r=sco…
61bdd11 
…ttmcm

codegen_ssa: replace a Result by an Either

`Err` here clearly does not indicate an "error" of any sort, so the use of `Result` is confusing. Let's use a sum type that does not come with the baggage of `Result`.
@saethlin
Rollup merge of rust-lang#143445 - folkertdev:va-list-intrinsics, r=R…
7245feb 
…alfJung

move `va_copy`, `va_arg` and `va_end` to `core::intrinsics`

some questions:

- should these functions be `pub`?
- is a separate module justified?

r? `@RalfJung`
@saethlin
Rollup merge of rust-lang#143447 - jieyouxu:compiletest-maintenance-4…
53757e6 
…, r=Kobzol

[COMPILETEST-UNTANGLE 4/N] Improve compiletest config documentation

This is part of a patch series to untangle `compiletest` to hopefully nudge it towards being more maintainable.

This PR should contain **no functional changes**.

This is pulled out to its own PR to make follow-up changes easier to review.

There are *intentionally* a *lot* of FIXME comments, intended to be gradually addressed in follow-ups.

r? `@Kobzol`
@rustbot rustbot added A-compiletest Area: The compiletest test runner 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 Jul 5, 2025
@saethlin
Copy link
Member Author

saethlin commented Jul 5, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 5, 2025

📌 Commit 53757e6 has been approved by saethlin

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 Jul 5, 2025
@bors
Copy link
Collaborator

bors commented Jul 5, 2025

⌛ Testing commit 53757e6 with merge 175e043...

@bors
Copy link
Collaborator

bors commented Jul 5, 2025

☀️ Test successful - checks-actions
Approved by: saethlin
Pushing 175e043 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 5, 2025
@bors bors merged commit 175e043 into rust-lang:master Jul 5, 2025
1 check passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 5, 2025
@rust-timer
Copy link
Collaborator

rust-timer commented Jul 5, 2025

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#143291 codegen_ssa: replace a Result by an Either d0049a6bf89b6b8745b430e3c9065dbc3211d0f9 (link)
#143445 move va_copy, va_arg and va_end to core::intrinsics 21c6f7bdd906186d33f20989d2f93fb545ebcf2b (link)
#143447 [COMPILETEST-UNTANGLE 4/N] Improve compiletest config docum… 312b13ae56a6b59907f02181b2e21e38c77c7bd6 (link)

previous master: 6dec76f1c2

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
Contributor

github-actions bot commented Jul 5, 2025

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 6dec76f (parent) -> 175e043 (this PR)

Test differences

Show 42 test diffs

42 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 175e04331be56c5b4bdf77478434b1a5e0556770 --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. x86_64-apple-2: 5001.2s -> 3554.5s (-28.9%)
  2. x86_64-apple-1: 8287.6s -> 6826.3s (-17.6%)
  3. dist-x86_64-apple: 9667.6s -> 8207.3s (-15.1%)
  4. dist-apple-various: 5850.2s -> 6485.9s (10.9%)
  5. tidy: 78.8s -> 70.9s (-10.0%)
  6. dist-aarch64-msvc: 8868.5s -> 8117.8s (-8.5%)
  7. test-various: 5068.9s -> 4657.9s (-8.1%)
  8. i686-msvc-2: 7042.0s -> 7608.4s (8.0%)
  9. aarch64-apple: 3679.7s -> 3968.9s (7.9%)
  10. dist-ohos-armv7: 4062.3s -> 3778.1s (-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.

@bors bors mentioned this pull request Jul 5, 2025
Merged
@rust-timer
Copy link
Collaborator

rust-timer commented Jul 5, 2025

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

Max RSS (memory usage)

Results (secondary -4.7%)

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)		 -4.7% [-4.7%, -4.7%] 1
All ❌✅ (primary) - - 0

Cycles

Results (secondary 2.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)		 2.9% [2.5%, 3.3%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 461.008s -> 459.09s (-0.42%)
Artifact size: 372.14 MiB -> 372.18 MiB (0.01%)

@saethlin saethlin deleted the rollup-4u43rgj branch November 26, 2025 00:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-compiletest Area: The compiletest test runner 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 S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

Projects

None yet

Milestone

1.90.0

Development

Successfully merging this pull request may close these issues.

7 participants

@saethlin @bors @rust-timer @rustbot @folkertdev @jieyouxu @RalfJung