Skip to content

miri subtree update#154830

Merged
rust-bors[bot] merged 16 commits intorust-lang:mainfrom
RalfJung:miri
Apr 5, 2026
Merged

miri subtree update#154830
rust-bors[bot] merged 16 commits intorust-lang:mainfrom
RalfJung:miri

Conversation

@RalfJung
Copy link
Copy Markdown
Member

@RalfJung RalfJung commented Apr 4, 2026

RalfJung and others added 15 commits April 1, 2026 08:36
This updates the rust-version file to 12ab1cf.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 12ab1cf
Filtered ref: 2df32b408f466131afc57abba520dcc01d9b130f
Upstream diff: rust-lang/rust@116458d...12ab1cf

This merge was created using https://github.com/rust-lang/josh-sync.
Add network socket `read`/`recv` and `write`/`send` shims
This updates the rust-version file to 55e86c9.
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 4, 2026

The Miri subtree was changed

cc @rust-lang/miri

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 4, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 4, 2026

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.

@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 4, 2026

@bors r+

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 4, 2026

📌 Commit 21256d8 has been approved by RalfJung

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 Apr 4, 2026
rust-bors bot pushed a commit that referenced this pull request Apr 5, 2026
…uwer

Rollup of 2 pull requests

Successful merges:

 - #150129 (`BorrowedCursor`: make `init` a boolean)
 - #154830 (miri subtree update)
@rust-bors rust-bors bot merged commit f359441 into rust-lang:main Apr 5, 2026
11 checks passed
rust-timer added a commit that referenced this pull request Apr 5, 2026
Rollup merge of #154830 - RalfJung:miri, r=RalfJung

miri subtree update

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

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

r? @ghost
@rustbot rustbot added this to the 1.96.0 milestone Apr 5, 2026
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Apr 5, 2026
…uwer

Rollup of 2 pull requests

Successful merges:

 - rust-lang/rust#150129 (`BorrowedCursor`: make `init` a boolean)
 - rust-lang/rust#154830 (miri subtree update)
@RalfJung RalfJung deleted the miri branch April 6, 2026 15:49
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.

4 participants