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.
When looking for instances which could either be dynamically called
through a vtable or through a concrete trait method, we missed
`FnPtrShim`, instead only looking at `Item` and closure-likes.
CFI: Fix types that implement Fn, FnMut, or FnOnce

When looking for instances which could either be dynamically called through a vtable or through a concrete trait method, we missed `FnPtrShim`, instead only looking at `Item` and closure-likes. Fixes rust-lang#144641.

cc `@1c3t3a` `@Jakob-Koschel`
…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.
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 PG-exploit-mitigations Project group: Exploit mitigations 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. 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 77afaa5 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 77afaa5 with merge 7b46301...

bors added a commit that referenced this pull request Oct 16, 2025
Rollup of 7 pull requests

Successful merges:

 - #144936 (CFI: Fix types that implement Fn, FnMut, or FnOnce)
 - #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)
 - #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 aarch64-apple failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] tests/ui/sanitizer/kcfi/fn-trait-objects.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/bin/rustc" "/Users/runner/work/rust/rust/tests/ui/sanitizer/kcfi/fn-trait-objects.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/work/rust/rust/vendor" "--sysroot" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2" "--target=aarch64-apple-darwin" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "-o" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/sanitizer/kcfi/fn-trait-objects/a" "-A" "internal_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "-Ctarget-feature=-crt-static" "-Zpanic_abort_tests" "-Cpanic=abort" "-Cprefer-dynamic=off" "-Copt-level=0" "-Zsanitizer=kcfi" "-Cunsafe-allow-abi-mismatch=sanitizer" "--test"
stdout: none
--- stderr -------------------------------
error: kcfi sanitizer is not supported for this target

error: aborting due to 1 previous error

@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
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 16, 2025
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 PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup 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. T-style Relevant to the style team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.