Skip to content

Miri subtree update #142260

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 30 commits into from
Closed

Miri subtree update #142260

wants to merge 30 commits into from

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 9, 2025

r? @ghost

RalfJung and others added 29 commits June 1, 2025 14:58
@RalfJung
Merge pull request rust-lang#4370 from Noratrieb/fix-for-real
c10a629 
Make sure to sync on file-io.rs tokio test
Preparing for merge from rustc
1a1d180
Merge from rustc
08cad5a
@RalfJung
Merge pull request rust-lang#4373 from rust-lang/rustup-2025-06-03
2d8ccc5 
Automatic Rustup
@nia-e
native-lib: allow multiple libraries and/or dirs
80a95b7
Preparing for merge from rustc
beff63b
Merge from rustc
db72088
@RalfJung
Merge pull request rust-lang#4375 from rust-lang/rustup-2025-06-04
9a7255e 
Automatic Rustup
@oli-obk
Merge pull request rust-lang#4372 from nia-e/multiple-native-libs
d55a99a 
native-lib: allow multiple libraries and/or dirs
Preparing for merge from rustc
869baea
Merge from rustc
bd898e3
@RalfJung
Merge pull request rust-lang#4377 from rust-lang/rustup-2025-06-05
412628d 
Automatic Rustup
Preparing for merge from rustc
8c410ca
Merge from rustc
09a9795
@oli-obk
Merge pull request rust-lang#4380 from rust-lang/rustup-2025-06-06
5ff78d6 
Automatic Rustup
@RalfJung
use File::lock to implement flock, and add a test for File::lock
b1652dc
@RalfJung
Merge pull request rust-lang#4378 from RalfJung/flock
94df54b 
use File::lock to implement flock, and add a test for File::lock
Preparing for merge from rustc
24921a1
Merge from rustc
bc4a305
fmt
e6ddcf4
@RalfJung
Merge pull request rust-lang#4381 from rust-lang/rustup-2025-06-07
0784b5b 
Automatic Rustup
Preparing for merge from rustc
370a7fa
Merge from rustc
963dd5e
@RalfJung
Merge pull request rust-lang#4385 from rust-lang/rustup-2025-06-08
638c414 
Automatic Rustup
Preparing for merge from rustc
db95049
Merge from rustc
f742bbf
@RalfJung
Merge pull request rust-lang#4388 from rust-lang/rustup-2025-06-09
4fe6e99 
Automatic Rustup
Add -Zmiri-tree-borrows-no-precise-interior-mut flag
4e8d583
@RalfJung
Merge pull request rust-lang#4376 from yoctocell/tb-interior-mut-flag
420e034 
TB: Add flag to disable the more precise interior mutability tracking
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 9, 2025

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Jun 9, 2025

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
Member Author

RalfJung commented Jun 9, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 9, 2025

📌 Commit eb420d1 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 Jun 9, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 10, 2025
@workingjubilee
Rollup merge of rust-lang#142260 - RalfJung:miri-sync, r=RalfJung
ec6d6b9 
Miri subtree update

r? `@ghost`
@workingjubilee workingjubilee mentioned this pull request Jun 10, 2025
Closed
bors added a commit that referenced this pull request Jun 10, 2025
@bors
Auto merge of #142278 - workingjubilee:rollup-4msac0t, r=workingjubilee
50bb66e 
Rollup of 13 pull requests

Successful merges:

 - #134442 (Specify the behavior of `file!`)
 - #134841 (Look at proc-macro attributes when encountering unknown attribute)
 - #140372 (Exhaustively handle parsed attributes in CheckAttr)
 - #140766 (Stabilize keylocker)
 - #141061 (Change __rust_no_alloc_shim_is_unstable to be a function)
 - #142042 (Make E0621 missing lifetime suggestion verbose)
 - #142101 (core::ptr: deduplicate more method docs)
 - #142176 (tests: Split dont-shuffle-bswaps along opt-levels and arches)
 - #142258 (platform-support.md: Mention specific Linux kernel version or later)
 - #142260 (Miri subtree update)
 - #142262 (Mark `core::slice::memchr` as `#[doc(hidden)]`)
 - #142272 (tests: Change ABIs in tests to more future-resilient ones)
 - #142275 (rustdoc: Refractor `clean_ty_generics`)

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

@bors p=1

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 10, 2025
@workingjubilee
Rollup merge of rust-lang#142260 - RalfJung:miri-sync, r=RalfJung
e4f7031 
Miri subtree update

r? `@ghost`
@workingjubilee workingjubilee mentioned this pull request Jun 10, 2025
Closed
bors added a commit that referenced this pull request Jun 10, 2025
@bors
Auto merge of #142283 - workingjubilee:rollup-uxb08ai, r=workingjubilee
cb52859 
Rollup of 12 pull requests

Successful merges:

 - #134442 (Specify the behavior of `file!`)
 - #134841 (Look at proc-macro attributes when encountering unknown attribute)
 - #140372 (Exhaustively handle parsed attributes in CheckAttr)
 - #140766 (Stabilize keylocker)
 - #141061 (Change __rust_no_alloc_shim_is_unstable to be a function)
 - #142042 (Make E0621 missing lifetime suggestion verbose)
 - #142101 (core::ptr: deduplicate more method docs)
 - #142258 (platform-support.md: Mention specific Linux kernel version or later)
 - #142260 (Miri subtree update)
 - #142262 (Mark `core::slice::memchr` as `#[doc(hidden)]`)
 - #142272 (tests: Change ABIs in tests to more future-resilient ones)
 - #142275 (rustdoc: Refractor `clean_ty_generics`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Jun 10, 2025

⌛ Testing commit eb420d1 with merge 6b5238b...

bors added a commit that referenced this pull request Jun 10, 2025
@bors
Auto merge of #142260 - RalfJung:miri-sync, r=RalfJung
6b5238b 
Miri subtree update

r? `@ghost`
@RalfJung
Copy link
Member Author

@bors r- retry
I'll ge-do the sync to include some more changes.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 10, 2025
@RalfJung RalfJung closed this Jun 10, 2025
@RalfJung RalfJung deleted the miri-sync branch June 10, 2025 10:33
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

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@RalfJung @rustbot @rust-log-analyzer @bors @nia-e @oli-obk