Skip to content

miri subtree update #146893

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
Closed
wants to merge 13 commits into from
Closed

miri subtree update #146893

wants to merge 13 commits into from
+355 −440

Conversation

RalfJung
Copy link
Member

This is mostly to get the changes that should reduce spurious test failures.

Subtree update of miri to rust-lang/miri@f698412.

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

r? @ghost

RalfJung and others added 13 commits September 19, 2025 10:41
@RalfJung
fix clippy warning
7506352
@RalfJung
Merge pull request rust-lang#4594 from RalfJung/clippy
0dac2f0 
fix clippy warning: use if let
Prepare for merging from rust-lang/rust
88ceae9 
This updates the rust-version file to ec38671.
Merge ref 'ec3867107526' from rust-lang/rust
20a0335 
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: ec38671
Filtered ref: ed8e25574abf50600d9d2fd61eda90708ccce6c2
Upstream diff: rust-lang/rust@3f1552a...ec38671

This merge was created using https://github.com/rust-lang/josh-sync.
@RalfJung
clippy
086bc1a
@RalfJung
CI: test bootstrap build
bb73aaf
@RalfJung
Merge pull request rust-lang#4598 from rust-lang/rustup-2025-09-20
be51cd9 
Automatic Rustup
@RalfJung
TB: rename Active → Unique to match paper
1c31602
@RalfJung
Tree::new_child: remove SIFA precondition and sync terminology
bbe05dc
@RalfJung
Merge pull request rust-lang#4595 from RalfJung/tb-terms
164a501 
TB: update terminology to match paper & MiniRust
@RalfJung
share check_all_outcomes impl, and increase max iteration counts
35390ed
@RalfJung
share the check_nondet helper as well
84437ed
@RalfJung
Merge pull request rust-lang#4599 from RalfJung/nondet
dda0eef 
share non-det test helpers and increase iteration counts
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 22, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 22, 2025

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

@bors p=1

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 22, 2025

📌 Commit dda0eef 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 Sep 22, 2025
@bors
Copy link
Collaborator

bors commented Sep 22, 2025

☔ The latest upstream changes (presumably #146683) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 22, 2025
@RalfJung RalfJung closed this Sep 22, 2025
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 22, 2025
@RalfJung RalfJung deleted the miri branch September 22, 2025 21:32
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RalfJung @rustbot @bors