Skip to content

Miri subtree update #123553

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.

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

Merged
merged 38 commits into from
Apr 6, 2024
Merged

Miri subtree update #123553

merged 38 commits into from
Apr 6, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Apr 6, 2024

r? @ghost

RalfJung and others added 30 commits March 31, 2024 10:08
extern-so: give the version script a better name; show errors from failing to build the C lib
speed up Windows CI

The many-seeds test is taking 15 minutes. Let's just run that only once instead of many times on Windows.

Also refactor the CI script to make the caller control which tests are being run.
looks like the M1 runners don't like it when the cache was created on x86

also reorder the lines to be more semantically grouped
experiment with macOS M1 runners

Try running our macOS CI on the new free M1 runners. This would mean that our 3 jobs run 3 different OSes and 3 different host CPU architectures. :)
shims/unix: split general FD management from FS access

`fd.rs` was a mix of general file descriptor infrastructure and file system access. Split those things up properly.

Also add a `socket.rs` file where support for sockets can go eventually. For now it just contains the socketpair stub.
…r=RalfJung

shims/linux: move epoll and eventfd into their own respective files

Also put the FD types into those files; they can then even be made private there.
eventfd: fix flag check and note a FIXME
bors and others added 8 commits April 5, 2024 11:19
linux/foreign_items: reorder things to make more sense

also remove duplicate socketpair
Signed-off-by: findseat <[email protected]>
make 'missing extern static' error consistent with missing shim

What's relevant is mostly the link name of the external symbol, not its Rust path.
@rustbot
Copy link
Collaborator

rustbot commented Apr 6, 2024

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 6, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Apr 6, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 6, 2024

📌 Commit f7feabc 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 Apr 6, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2024
…llaumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#123541 (remove miri-test-libstd hacks that are no longer needed)
 - rust-lang#123552 (Add missing -Zquery-dep-graph to the spike-neg incr comp tests)
 - rust-lang#123553 (Miri subtree update)
 - rust-lang#123554 (Simplify/cleanup `search-result-color.goml`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 74c3b7b into rust-lang:master Apr 6, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2024
Rollup merge of rust-lang#123553 - RalfJung:miri, r=RalfJung

Miri subtree update

r? `@ghost`
@RalfJung RalfJung deleted the miri branch April 7, 2024 05:31
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.

3 participants