Skip to content

Rollup of 5 pull requests#153392

Merged
rust-bors[bot] merged 10 commits intorust-lang:mainfrom
matthiaskrgr:rollup-UDvxmNA
Mar 4, 2026
Merged

Rollup of 5 pull requests#153392
rust-bors[bot] merged 10 commits intorust-lang:mainfrom
matthiaskrgr:rollup-UDvxmNA

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

homersimpsons and others added 10 commits February 28, 2026 17:37
std: refactor Xous startup code

To facilitate rust-lang#117276 I'm moving all non-path-related code out of `sys::pal::os` (see also rust-lang#153130). This is particularly involved for Xous as `pal::os` also contains the `_start` entry function and the parameter block handling. This PR moves both out into the main `sys::pal` module and also simplifies the parameter block initialisation code slightly.

CC @xobs
Check for region dependent goals on type_op itself as well

Fixes rust-lang#151318

r? lcnr
…alueFormat-disabled, r=marcoieni

Fix LegacyKeyValueFormat report from docker build: disabled

Part of rust-lang#152305

Following rust-lang#153109

r? @marcoieni
…rash, r=oli-obk

Fix async drop multi crate crash

fixes rust-lang#142572
Again, I've been talking in the Zulip about this: [#wg-async > is there a way I can help with Async Drop? @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/187312-wg-async/topic/is.20there.20a.20way.20I.20can.20help.20with.20Async.20Drop.3F/near/575627286)

TL;DR: This is going to be a bit of a refactor, hold your horses

Also, I might end up splitting this into two PRs, so I can first merge my elaborate_drop.rs refactor, and then my fix for the crash later, but IDK yet
fix autodiff parsing for non-trait impl

fixes: rust-lang#153322

@Sa4dUs Looks like we missed a case.
But also, going through the code, line 455 seems suspicious to me:
`Annotatable::AssocItem(d_fn, Impl { of_trait: false })`
Are we sure that this should always be an Impl, and never an impl of a trait?

r? @oli-obk
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 4, 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 Mar 4, 2026
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 4, 2026

📌 Commit e42a3ba has been approved by matthiaskrgr

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

rust-bors bot commented Mar 4, 2026

☀️ Test successful - CI
Approved by: matthiaskrgr
Duration: 3h 22m 3s
Pushing b90dc1e to main...

@rust-bors rust-bors bot merged commit b90dc1e into rust-lang:main Mar 4, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 4, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152816 Check for region dependent goals on type_op itself as well 7ff7efb0cb1bc3ba76ace95ca2b2de58e20f376a (link)
#153224 Fix LegacyKeyValueFormat report from docker build: disabled ecf644df6ae2ad891f1f3dae435f79251eab6e67 (link)
#153274 Fix async drop multi crate crash c4e4395ca0dac0a29857da201c78094108e2f870 (link)
#153324 fix autodiff parsing for non-trait impl 7a762676b86905a497ebc71b44f1ca6fbd24045c (link)
#153341 std: refactor Xous startup code e0326277e54b8845953ca61aad247ee82345567c (link)

previous master: d933cf483e

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 Mar 4, 2026

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 d933cf4 (parent) -> b90dc1e (this PR)

Test differences

Show 14 test diffs

Stage 1

  • [codegen] tests/codegen-llvm/autodiff/impl.rs: [missing] -> ignore (ignored when LLVM Enzyme is disabled or LLVM is not the default codegen backend) (J0)
  • [ui] tests/ui/async-await/async-drop/async-drop-run-without-feature/async-drop-run-without-feature.rs: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/assembly/ambiguity-due-to-uniquification-4.rs#current: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/assembly/ambiguity-due-to-uniquification-4.rs#next: [missing] -> pass (J2)
  • [ui] tests/ui/wf/return-type-non-wf-no-ice.rs#current: [missing] -> pass (J2)
  • [ui] tests/ui/wf/return-type-non-wf-no-ice.rs#next: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/async-await/async-drop/async-drop-run-without-feature/async-drop-run-without-feature.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/assembly/ambiguity-due-to-uniquification-4.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/assembly/ambiguity-due-to-uniquification-4.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/wf/return-type-non-wf-no-ice.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/wf/return-type-non-wf-no-ice.rs#next: [missing] -> pass (J1)
  • [codegen] tests/codegen-llvm/autodiff/impl.rs: [missing] -> ignore (ignored when LLVM Enzyme is disabled or LLVM is not the default codegen backend) (J3)

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

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard b90dc1e597db0bbc0cab0eccb39747b1a9d7e607 --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-apple: 1h 48m -> 2h 13m (+23.2%)
  2. dist-x86_64-apple: 2h 2m -> 2h 19m (+14.1%)
  3. dist-apple-various: 2h 3m -> 1h 48m (-12.0%)
  4. dist-aarch64-llvm-mingw: 1h 42m -> 1h 31m (-10.1%)
  5. i686-gnu-2: 1h 46m -> 1h 35m (-9.9%)
  6. x86_64-msvc-2: 2h 18m -> 2h 30m (+8.7%)
  7. x86_64-gnu-stable: 2h 32m -> 2h 20m (-8.3%)
  8. aarch64-gnu-debug: 1h 14m -> 1h 8m (-8.1%)
  9. x86_64-msvc-ext3: 1h 51m -> 1h 42m (-8.0%)
  10. test-various: 2h 7m -> 1h 56m (-7.9%)
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
Collaborator

Finished benchmarking commit (b90dc1e): comparison URL.

Overall result: ❌✅ regressions and 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.1% [0.1%, 0.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.1% [-0.2%, -0.1%] 3
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 2.5%, secondary 1.1%)

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

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

Cycles

Results (secondary 0.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)
3.1% [3.1%, 3.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.1%, secondary 0.1%)

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

mean range count
Regressions ❌
(primary)
0.1% [0.0%, 0.1%] 23
Regressions ❌
(secondary)
0.1% [0.0%, 0.1%] 57
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.0%, 0.1%] 23

Bootstrap: 481.183s -> 479.576s (-0.33%)
Artifact size: 394.90 MiB -> 397.00 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.

7 participants