Skip to content

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Oct 16, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lasiotus and others added 30 commits October 8, 2025 08:57
As part of work to add stdlib support for Motor OS.
Motor OS was added as a no-std Tier-3 target in rust-lang#146848 as x86_64-unknown-motor. This patch/PR adds the std library for Motor OS. While the patch may seem large, all it does is proxy std pal calls to moto-rt. When there is some non-trivial code (e.g. thread::spawn), it is quite similar, and often identical, to what other platforms do.
use check_nondet helper in a few more places
native-lib: support all types with Scalar layout
This updates the rust-version file to 235a4c0.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 235a4c0 Filtered ref: 548dcbbeab7592100a0ba9f2338ddc8ad1003824 Upstream diff: rust-lang/rust@36e4f5d...235a4c0 This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 28d0a4a.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 28d0a4a Filtered ref: 310e49750b70768361f78966c10be9716a300784 Upstream diff: rust-lang/rust@235a4c0...28d0a4a This merge was created using https://github.com/rust-lang/josh-sync.
It's a synonym for `u64` and there are a couple of places where we use `u64` where we should use `Word`, which this commit fixes. I found this when I tried changing `Word` to `u128` (which made performance worse).
the advice appears to apply to empty structs with braces (parens/blocks), and a unit struct in the comment does not make sense. Fix the typo.
…ss35 std: Add Motor OS std library port Motor OS was added as a no-std Tier-3 target in [PR 146848](rust-lang#146848) as x86_64-unknown-motor. This PR adds the std library for Motor OS. While the PR may seem large, all it does is proxy std pal calls to [moto-rt](https://crates.io/crates/moto-rt). Where there is some non-trivial code (e.g. thread::spawn), it is quite similar, often identical, to what other platforms do.
Don't highlight `let` expressions as having type `bool` in let-chain error messages Addresses rust-lang#147665.
…r=samueltardieu Fix whitespace in rustfmt-excluded clippy file Accidentally introduced in rust-lang#143548
miri subtree update Subtree update of `miri` to rust-lang/miri@50ba3a7. Created using https://github.com/rust-lang/josh-sync. r? `````@ghost`````
Use `bit_set::Word` in a couple more places. It's a synonym for `u64` and there are a couple of places where we use `u64` where we should use `Word`, which this commit fixes. I found this when I tried changing `Word` to `u128` (which made performance worse). r? ````@Zalathar````
…kang style-guide: fix typo for empty struct advice the advice appears to apply to empty structs with braces (parens/blocks), and a unit struct in the comment does not make sense. Fix the typo.
@rustbot rustbot added A-tidy Area: The tidy tool 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-clippy Relevant to the Clippy team. 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. T-style Relevant to the style team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 16, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 16, 2025

📌 Commit 2e64881 has been approved by matthiaskrgr

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 Oct 16, 2025
@bors
Copy link
Collaborator

bors commented Oct 16, 2025

⌛ Testing commit 2e64881 with merge 5a87bc0...

bors added a commit that referenced this pull request Oct 16, 2025
Rollup of 7 pull requests Successful merges: - #147000 (std: Add Motor OS std library port) - #147732 (remove duplicate inline macro) - #147738 (Don't highlight `let` expressions as having type `bool` in let-chain error messages) - #147739 (Fix whitespace in rustfmt-excluded clippy file) - #147744 (miri subtree update) - #147751 (Use `bit_set::Word` in a couple more places.) - #147752 (style-guide: fix typo for empty struct advice) r? `@ghost` `@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-aux failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
 3: mpsc::stress_recv_timeout_two_threads at library/std/tests/sync/mpsc.rs:457:5 4: mpsc::stress_recv_timeout_two_threads::{closure#0} at library/std/tests/sync/mpsc.rs:426:37 5: <{closure@library/std/tests/sync/mpsc.rs:426:1: 458:2} as std::ops::FnOnce<()>>::call_once - shim at /checkout/library/core/src/ops/function.rs:250:5 6: <fn() -> std::result::Result<(), std::string::String> as std::ops::FnOnce<()>>::call_once - shim(fn() -> std::result::Result<(), std::string::String>) at /checkout/library/core/src/ops/function.rs:250:5 note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace. ---- mpsc::stress_recv_timeout_two_threads stdout end ---- --- error: test failed, to rerun pass `-p std --test sync` Bootstrap failed while executing `miri --stage 2 library/std -- --skip fs:: --skip net:: --skip process:: --skip sys::` Build completed unsuccessfully in 0:13:06 make: *** [Makefile:58: check-aux] Error 1 local time: Thu Oct 16 11:37:36 UTC 2025 network time: Thu, 16 Oct 2025 11:37:36 GMT ##[error]Process completed with exit code 2. ##[group]Run echo "disk usage:" echo "disk usage:" 
@bors
Copy link
Collaborator

bors commented Oct 16, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 16, 2025
@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 Oct 16, 2025
@samueltardieu
Copy link
Member

@matthiaskrgr Can you remove #147739? Sorry for the back and forth, it has been integrated into the Clippy sync PR.

@bors
Copy link
Collaborator

bors commented Oct 16, 2025

⌛ Testing commit 2e64881 with merge c721120...

bors added a commit that referenced this pull request Oct 16, 2025
Rollup of 7 pull requests Successful merges: - #147000 (std: Add Motor OS std library port) - #147732 (remove duplicate inline macro) - #147738 (Don't highlight `let` expressions as having type `bool` in let-chain error messages) - #147739 (Fix whitespace in rustfmt-excluded clippy file) - #147744 (miri subtree update) - #147751 (Use `bit_set::Word` in a couple more places.) - #147752 (style-guide: fix typo for empty struct advice) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-tidy Area: The tidy tool 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-clippy Relevant to the Clippy team. 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. T-style Relevant to the style team, which will review and decide on the PR/issue.