Skip to content

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented Jan 4, 2026

Subtree update of miri to rust-lang/miri@5d149f2.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

folkertdev and others added 23 commits January 1, 2026 14:37
This commit adds basic support for FFI callbacks by registering a shim function
via libffi. This shim function currently only exits with an error. The main
motivation for this is to prevent miri segfaulting as described in
[4639](rust-lang/miri#4639).

In the future miri could try to continue execution in the registered
callback, although as far as I understand Ralf that is no easy problem.
Basic support for FFI callbacks (at least stop segfaulting and report a proper error)
native lib support: support returning structs
android: get the entire test suite to pass
This updates the rust-version file to e8f3cfc.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: e8f3cfc
Filtered ref: 5837f859c413e836e4fd1eb4985632c2f62c7db0
Upstream diff: rust-lang/rust@7fefa09...e8f3cfc

This merge was created using https://github.com/rust-lang/josh-sync.
…ests/libc-pipe

Refactor libc pipe tests to use utility functions for error handling and data operations
This updates the rust-version file to f57b9e6.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: f57b9e6
Filtered ref: dd835ad11d6c5cea520a087bb620e3643e2dbf0f
Upstream diff: rust-lang/rust@e8f3cfc...f57b9e6

This merge was created using https://github.com/rust-lang/josh-sync.
add check_only feature for faster check builds
@rustbot
Copy link
Collaborator

rustbot commented Jan 4, 2026

The Miri subtree was changed

cc @rust-lang/miri

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 4, 2026
@RalfJung
Copy link
Member Author

RalfJung commented Jan 4, 2026

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 4, 2026

📌 Commit ff2acf0 has been approved by RalfJung

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 Jan 4, 2026
bors added a commit that referenced this pull request Jan 4, 2026
Rollup of 5 pull requests

Successful merges:

 - #150554 (test: add regression cases for valtree hashing ICE)
 - #150597 (make specialization of `Vec::extend` and `VecDeque::extend_front` work for vec::IntoIter with any `Allocator`, not just `Global`)
 - #150619 (alloc: Move Cow impl to existing ones)
 - #150660 (THIR pattern building: Pass HIR nodes instead of loose types/spans)
 - #150671 (miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@RalfJung
Copy link
Member Author

RalfJung commented Jan 4, 2026

@bors p=1

@bors bors merged commit eeb4431 into rust-lang:main Jan 4, 2026
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 4, 2026
rust-timer added a commit that referenced this pull request Jan 4, 2026
Rollup merge of #150671 - RalfJung:miri, r=RalfJung

miri subtree update

Subtree update of `miri` to rust-lang/miri@5d149f2.

Created using https://github.com/rust-lang/josh-sync.

r? `@ghost`
@bors
Copy link
Collaborator

bors commented Jan 4, 2026

⌛ Testing commit ff2acf0 with merge e29fcf4...

@jhpratt
Copy link
Member

jhpratt commented Jan 4, 2026

@bors retry r- (sync)

@RalfJung RalfJung deleted the miri branch January 5, 2026 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants