Skip to content

Rollup of 4 pull requests #123557

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 48 commits into from
Apr 6, 2024
Merged

Rollup of 4 pull requests #123557

merged 48 commits into from
Apr 6, 2024

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

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
RalfJung and others added 14 commits April 6, 2024 08:07
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.
This ensures that the tests actually test what they are meant to test
rather than exitting immediately with an error that -Zquery-dep-graph
has to be passed.
…Simulacrum

remove miri-test-libstd hacks that are no longer needed

In rust-lang#123317 we developed a different approach to testing the standard library in Miri, and with rust-lang/miri-test-libstd#56 the out-of-tree miri-test-libstd has been switched to that approach. That makes these hacks here no longer necessary.
…acrum

Add missing -Zquery-dep-graph to the spike-neg incr comp tests

This ensures that the tests actually test what they are meant to test rather than exitting immediately with an error that -Zquery-dep-graph has to be passed.
…lt-color, r=notriddle

Simplify/cleanup `search-result-color.goml`

Greatly shorten code of `search-result-color.goml` GUI test.

I split the changes into smaller commits to allow to more easily see what changed.

r? `@notriddle`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 6, 2024
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=4 rollup=never

@bors
Copy link
Collaborator

bors commented Apr 6, 2024

📌 Commit 3a203b0 has been approved by GuillaumeGomez

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
Copy link
Collaborator

bors commented Apr 6, 2024

⌛ Testing commit 3a203b0 with merge aa1c459...

@bors
Copy link
Collaborator

bors commented Apr 6, 2024

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing aa1c459 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 6, 2024
@bors bors merged commit aa1c459 into rust-lang:master Apr 6, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 6, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#123541 remove miri-test-libstd hacks that are no longer needed 83931ede892a790e17de48c764b94cfb39b54b6e (link)
#123552 Add missing -Zquery-dep-graph to the spike-neg incr comp te… 15b18f43f2d349c3b3459de42b105fe698afe040 (link)
#123553 Miri subtree update 2afb9efacfd06729301639a7de31d63471cad02d (link)
#123554 Simplify/cleanup search-result-color.goml 8c7e91c58a7e221a38f6eb5033fd8521893b2c3f (link)

previous master: 773fb88e13

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@GuillaumeGomez GuillaumeGomez deleted the rollup-3af7urf branch April 6, 2024 19:18
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (aa1c459): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
3.0% [3.0%, 3.0%] 1
Regressions ❌
(secondary)
7.8% [7.8%, 7.8%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.0% [3.0%, 3.0%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 668.041s -> 670.181s (0.32%)
Artifact size: 318.25 MiB -> 318.20 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants