Skip to content

Rollup of 2 pull requests #150476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
bors merged 5 commits into from
Dec 29, 2025
Merged

Rollup of 2 pull requests #150476

bors merged 5 commits into from
Dec 29, 2025

Conversation

@jhpratt
Copy link
Member

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

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lasiotus and others added 5 commits December 19, 2025 15:48
@lasiotus
std: switch to moto-rt v0.16.0
fb6dd17
@xobs
xous: fix unwinding and unused symbol errors
68adc19 
The unwinding feature is called `panic-unwind` and not `panic_unwind`.
Adjust the feature gate to look for these values.

Additionally, the `abort_internal()` call is no longer used.

Signed-off-by: Sean Cross <[email protected]>
@xobs
xous: fix calling of rust_main_thread_not_inlined
41fe03a 
This function was incorrectly called run_main_thread_not_inlined when
invoked.

Signed-off-by: Sean Cross <[email protected]>
@jhpratt
Rollup merge of rust-lang#150178 - moturus:motor-os-rt-ver-16, r=Mark…
771eb91 
…-Simulacrum

std: Motor OS: switch to moto-rt v0.16.0
@jhpratt
Rollup merge of rust-lang#150363 - betrusted-io:xous-misc-fixes, r=jh…
3fc0f58 
…pratt

xous: fix build due to function and feature name changes

This tracks a rename of `panic_unwind` to `panic-unwind`, as well as the removal of `abort_internal` as a function.

This also fixes an incorrect function name from when `rust_main_thread_not_inlined` was added.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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
@jhpratt
Copy link
Member Author

jhpratt commented Dec 29, 2025

@bors r+ rollup=never p=2

@bors
Copy link
Collaborator

bors commented Dec 29, 2025

📌 Commit 3fc0f58 has been approved by jhpratt

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
Collaborator

bors commented Dec 29, 2025

⌛ Testing commit 3fc0f58 with merge a1bb910...

@bors
Copy link
Collaborator

bors commented Dec 29, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing a1bb910 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2025
@bors bors merged commit a1bb910 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
Collaborator

rust-timer commented Dec 29, 2025

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#150178 std: Motor OS: switch to moto-rt v0.16.0 d4f33352cd85369525814ad6ca3ef45bcb3c5153 (link)
#150363 xous: fix build due to function and feature name changes bdeb3ecea96a150488cd1b306c10ecfb717094c2 (link)

previous master: 112a274275

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 Dec 29, 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 112a274 (parent) -> a1bb910 (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard a1bb9103b0b8da0f0eefd3d6b76b01391fe9e86d --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. aarch64-apple: 8993.2s -> 10605.8s (+17.9%)
  2. dist-apple-various: 3331.7s -> 3804.2s (+14.2%)
  3. x86_64-rust-for-linux: 2510.7s -> 2756.0s (+9.8%)
  4. aarch64-msvc-2: 5925.0s -> 6355.4s (+7.3%)
  5. aarch64-msvc-1: 7084.9s -> 6578.0s (-7.2%)
  6. x86_64-gnu-llvm-20-3: 6276.3s -> 6717.8s (+7.0%)
  7. i686-gnu-1: 7514.5s -> 6986.7s (-7.0%)
  8. x86_64-gnu-nopt: 9084.4s -> 8541.6s (-6.0%)
  9. dist-ohos-x86_64: 4343.6s -> 4101.9s (-5.6%)
  10. tidy: 165.4s -> 174.2s (+5.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.

@jhpratt jhpratt deleted the rollup-sgjxdxk branch December 29, 2025 12:13
@rust-timer
Copy link
Collaborator

rust-timer commented Dec 29, 2025

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

Max RSS (memory usage)

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

Cycles

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

Binary size

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

Bootstrap: 485.523s -> 482.459s (-0.63%)
Artifact size: 390.82 MiB -> 390.85 MiB (0.01%)

This was referenced Dec 29, 2025
Open
Merged
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

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-libs Relevant 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.

6 participants

@jhpratt @bors @rust-timer @rustbot @lasiotus @xobs