Skip to content

Miri subtree update #143478

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
Merged
merged 59 commits into from
Jul 6, 2025
Merged

Miri subtree update #143478

merged 59 commits into from
Jul 6, 2025
+1,469 −475

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 5, 2025

r? @ghost

YohDeadfall and others added 30 commits June 28, 2025 23:35
@YohDeadfall
Synced rust-analyzer configs
6e05d61
@RalfJung
Merge pull request rust-lang#4415 from YohDeadfall/sync-ra-configs
40ec147 
Synced rust-analyzer configs
Preparing for merge from rustc
75e22d5
Merge from rustc
7b985d5
@RalfJung
Merge pull request rust-lang#4420 from rust-lang/rustup-2025-06-29
03a7b9f 
Automatic Rustup
@RalfJung
make ./miri work on stable again
7be1bf7
@RalfJung
Merge pull request rust-lang#4423 from RalfJung/miri-script-stable
d01e001 
make ./miri work on stable again
@RalfJung
also test on arm-64 linux hosts
ea69081
@RalfJung
Merge pull request rust-lang#4424 from RalfJung/aarch64-linux-ci
651d2f8 
also test on arm-64 linux hosts
@RalfJung
Preparing for merge from rustc
d539e66
@RalfJung
Merge from rustc
9c22372
@RalfJung
Merge pull request rust-lang#4425 from RalfJung/rustup
33f1700 
Rustup
@RalfJung
fix type mismatches in native-lib/scalar_arguments test
ab2443c
@RalfJung
test on x86-32 and arm-32
6aaaff8
@RalfJung
also test on s390x via qemu
e788b3c
@RalfJung
remove duplicate clippy check
d559073
@RalfJung
add a riscv64 test job
ec85b70
@tgross35
Add shims for gettid-esque functions
d69b8e2 
Various platforms provide a function to return the current OS thread ID,
but they all use a slightly different name. Add shims for these
functions for Apple, FreeBSD, and Windows, with tests to account for
those and a few more platforms that are not yet supported by Miri. The
syscall and extern symbol is included as well on Linux.

These should be useful in general but will also help support printing
the OS thread ID in panic messages [1].

[1]: rust-lang#115746

Squashed commit from Ralf:

    try_from_scalar: extend comment
@RalfJung
Merge pull request rust-lang#4422 from RalfJung/more-ci
d1ee0eb 
run CI on a bunch more architectures
@RalfJung
Merge pull request rust-lang#4397 from tgross35/gettid-shims
555553f 
Add shims for `gettid`-esque functions
@RalfJung
linux futex: fix for val > i32::MAX
cd971c6
@RalfJung
Merge pull request rust-lang#4429 from RalfJung/futex-val-too-big
8bb5f8c 
linux futex: fix for val > i32::MAX
Preparing for merge from rustc
0c3c9e4
Merge from rustc
e6371c9
fmt
8958967
@RalfJung
./miri toolchain: no need to run 'cargo metadata'
c52d522
@RalfJung
Merge pull request rust-lang#4431 from rust-lang/rustup-2025-07-01
83d519c 
Automatic Rustup
@RalfJung
re-balance CI jobs
828f594
@RalfJung
Merge pull request rust-lang#4432 from RalfJung/no-metadata
d72b15b 
./miri toolchain: no need to run 'cargo metadata'
@RalfJung
Merge pull request rust-lang#4433 from RalfJung/ci-balance
b9b8fd2 
re-balance CI jobs
@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2025

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 Jul 5, 2025
@RalfJung
Copy link
Member Author

RalfJung commented Jul 5, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 5, 2025

📌 Commit 6e3e05b 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 Jul 5, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 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 Jul 5, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 5, 2025

📌 Commit a1f4172 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jul 5, 2025

⌛ Testing commit a1f4172 with merge 3f92a0d...

bors added a commit that referenced this pull request Jul 5, 2025
@bors
Auto merge of #143478 - RalfJung:miri-sync, r=RalfJung
3f92a0d 
Miri subtree update

r? `@ghost`
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-19-2 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Collaborator

bors commented Jul 5, 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 Jul 5, 2025
@RalfJung
Copy link
Member Author

RalfJung commented Jul 5, 2025

@bors retry thread '[ui] tests/ui/rust-2018/removing-extern-crate-malformed-cfg.rs' panicked at src/tools/compiletest/src/runtest.rs:1921:47:

no idea what is up with that test...

@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 Jul 5, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 5, 2025
Merged
bors added a commit that referenced this pull request Jul 5, 2025
@bors
Auto merge of #143507 - matthiaskrgr:rollup-lpg7t12, r=matthiaskrgr
b7b5409 
Rollup of 6 pull requests

Successful merges:

 - #143238 (Port `#[ignore]` to the new attribute parsing infrastructure)
 - #143441 (Stop using `Key` trait unnecessarily)
 - #143478 (Miri subtree update)
 - #143486 (remove armv5te-unknown-linux-gnueabi target maintainer)
 - #143489 (Complete rustc_ast::mut_visit for spans.)
 - #143494 (Remove yields_in_scope from the scope tree.)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jul 6, 2025
@bors
Auto merge of #143507 - matthiaskrgr:rollup-lpg7t12, r=matthiaskrgr
febb10d 
Rollup of 6 pull requests

Successful merges:

 - #143238 (Port `#[ignore]` to the new attribute parsing infrastructure)
 - #143441 (Stop using `Key` trait unnecessarily)
 - #143478 (Miri subtree update)
 - #143486 (remove armv5te-unknown-linux-gnueabi target maintainer)
 - #143489 (Complete rustc_ast::mut_visit for spans.)
 - #143494 (Remove yields_in_scope from the scope tree.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7ad67e6 into rust-lang:master Jul 6, 2025
11 of 12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 6, 2025
rust-timer added a commit that referenced this pull request Jul 6, 2025
@rust-timer
Unrolled build for #143478
e2e0f87 
Rollup merge of #143478 - RalfJung:miri-sync, r=RalfJung

Miri subtree update

r? `@ghost`
@RalfJung RalfJung mentioned this pull request Jul 6, 2025
Open
@RalfJung RalfJung deleted the miri-sync branch July 6, 2025 13:31
github-actions bot pushed a commit to devnexen/miri that referenced this pull request Jul 7, 2025
@bors
Auto merge of #143507 - matthiaskrgr:rollup-lpg7t12, r=matthiaskrgr
516a9e0 
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#143238 (Port `#[ignore]` to the new attribute parsing infrastructure)
 - rust-lang/rust#143441 (Stop using `Key` trait unnecessarily)
 - rust-lang/rust#143478 (Miri subtree update)
 - rust-lang/rust#143486 (remove armv5te-unknown-linux-gnueabi target maintainer)
 - rust-lang/rust#143489 (Complete rustc_ast::mut_visit for spans.)
 - rust-lang/rust#143494 (Remove yields_in_scope from the scope tree.)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Jul 11, 2025
@matthiaskrgr
Rollup merge of rust-lang#143478 - RalfJung:miri-sync, r=RalfJung
ae0f057 
Miri subtree update

r? `@ghost`
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
1.90.0
Development

Successfully merging this pull request may close these issues.
9 participants
@RalfJung @rustbot @bors @rust-log-analyzer @YohDeadfall @tgross35 @LorrensP-2158466 @Stypox @oli-obk