Skip to content
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

Rollup of 7 pull requests #134052

Merged
merged 96 commits into from
Dec 9, 2024
Merged

Rollup of 7 pull requests #134052

merged 96 commits into from
Dec 9, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

JoJoDeveloping and others added 30 commits November 1, 2024 15:37
@JoJoDeveloping
Add benchmark showing effectivity of subtree skipping
95a5138
@tiif
Refactor AnonSocket::read/write
4400804
@CraftSpider
Fill out Windows error mapping table
6af006e
@RalfJung
eventfd: comment tweaks
7d38c51
@CraftSpider
Add comment about multiple errors to one ErrorKind
0a7e63a
@RalfJung
Merge pull request rust-lang#4046 from CraftSpider/windows-error-mapping
0267cbf 
Fill out windows io error mapping table
Preparing for merge from rustc
f77817a
Merge from rustc
69930dc
@RalfJung
epoll: fix comment typo
33f4d2e
@RalfJung
disable solaris on CI for now
7dcba03
@RalfJung
Merge pull request rust-lang#4049 from rust-lang/rustup-2024-11-22
76f27aa 
Automatic Rustup
@RalfJung
Merge pull request rust-lang#4047 from RalfJung/eventfd-comments
fa93f35 
eventfd: comment tweaks
@devnexen
sysconf interception fix for solarish systems.
004edb2 
also adding the `_SC_PAGESIZE` alias `_SC_PAGE_SIZE` supported by
Linux, macOS and FreeBSD.

close rust-lang#4050
@RalfJung
Merge pull request rust-lang#4052 from devnexen/gh4050
6a4aa9a 
sysconf interception fix for solarish systems.
@devnexen
follow-up on rust-lang#4052, making a miri evaluation context fn for …
bb55f52 
…strerror_r.
@RalfJung
Merge pull request rust-lang#4054 from devnexen/strerror_r_chg
a221d50 
follow-up on rust-lang#4052, making a miri evaluation context fn for strerror_r.
@devnexen @RalfJung
sysconf: add _SC_OPEN_MAX
1deb8f9
@RalfJung
Merge pull request rust-lang#4053 from devnexen/sysconf_extend
0761f07 
sysconf adding few more constants.
@RalfJung
Merge pull request rust-lang#4037 from tiif/blockpipe
d125945 
Refactor AnonSocket::read/write for blocking socketpair
@YohDeadfall
Added epoll and eventfd for Android
57c6615
@YohDeadfall @RalfJung
Fixed test target
64f42a4 
Co-authored-by: Ralf Jung <[email protected]>
@YohDeadfall
Added linux_like module
13aa5fb
@YohDeadfall
Fix the rest of the tests
065d9b5
@asquared31415
attempt to fix miri failing to create file when under weird powershel…
a05e53b 
…l configurations
@RalfJung
Merge pull request rust-lang#4016 from YohDeadfall/android-epoll
366001f 
Added epoll and eventfd for Android
@RalfJung
Merge pull request rust-lang#4061 from asquared31415/dep_info_fix
24a1946 
Use `PathBuf` APIs to correctly do some path manipulation cross-platform
@tiif
Simplify thread blocking tests
109c299
@oli-obk
Merge pull request rust-lang#4059 from tiif/fixtest
63ce8fb 
Simplify thread blocking tests
@devnexen
filesystem support for solarish.
15001f3 
close rust-lang#3890
@RalfJung
Merge pull request rust-lang#4031 from devnexen/solarish_stat
987d642 
filesystem support for solarish: stat
@matthiaskrgr
Rollup merge of rust-lang#134045 - ehuss:triagebot-path-fixes, r=comp…
6f89a61 
…iler-errors

Fix some triagebot mentions paths

This fixes some mentions paths in `triagebot.toml` that are no longer valid.

* rustdoc themes were merged into rustdoc.css (which already has a mention, and unfortunately can't independently mention the ayu theme). rust-lang#115829 cc `@GuillaumeGomez` `@Cldfire`
* The entry for `inspect_obligations.rs` was never correct, from rust-lang#122385. cc `@lcnr` `@compiler-errors`
* The entry for `need_type_info.rs` was moved in rust-lang#127501
@matthiaskrgr
Rollup merge of rust-lang#134046 - lqd:new-solver-hangs, r=compiler-e…
86f3ed3 
…rrors

Remove ignored tests for hangs w/ new solver

As asked on zulip [here](https://rust-lang.zulipchat.com/#narrow/channel/364551-t-types.2Ftrait-system-refactor/topic/needs_help.3A.20look.20through.20compare-mode.20hangs).

As far as I can tell there are no more UI tests that hang anymore, so this removes the ignore directives for the compare mode.

(As I was using `--compare-mode new-solver` and that failed in an obscure way without any info about what to do, I've also fixed its error handling in `compiletest`: it didn't show the invalid `--compare-mode`, nor the valid values one can pass).

r? lcnr
@matthiaskrgr
Rollup merge of rust-lang#134050 - RalfJung:miri-sync, r=RalfJung
e01cb62 
Miri subtree update

r? `@ghost`
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. 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 Dec 9, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Dec 9, 2024

📌 Commit e01cb62 has been approved by matthiaskrgr

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 Dec 9, 2024
@bors
Copy link
Contributor

bors commented Dec 9, 2024

⌛ Testing commit e01cb62 with merge 1b3fb31...

@bors
Copy link
Contributor

bors commented Dec 9, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 1b3fb31 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 9, 2024
@bors bors merged commit 1b3fb31 into rust-lang:master Dec 9, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 9, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#133567 A bunch of cleanups 8b4b61d9728d61a037e0505d36cc79d4b9f4bfc2 (link)
#133789 Add doc alias 'then_with' for then method on bool f834a6a4279715ca82b81dc1576acaa11003dc74 (link)
#133880 Expand home_dir docs 21a1e7d6b126f606facde3c4ae905c3c5729014a (link)
#134036 crash tests: use individual mir opts instead of mir-opt-lev… 139afda6e490769b2449bea9d42f8d28790c9a3c (link)
#134045 Fix some triagebot mentions paths 2a052f16c79754e5716cf12836b77329cb59d1b1 (link)
#134046 Remove ignored tests for hangs w/ new solver d25d6479b171957c3adfa756c69e3ab7119022bb (link)
#134050 Miri subtree update 6f63950c84de0aeb6a4a046107383ea02b9da5bf (link)

previous master: df5b8e39b7

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

This was referenced Dec 9, 2024
Open
Open
Open
Open
Open
Open
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1b3fb31): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -1.3%, secondary 1.5%)

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)		 - - 0
Regressions ❌
(secondary)		 3.6% [1.7%, 5.7%] 6
Improvements ✅
(primary)		 -1.3% [-1.3%, -1.3%] 1
Improvements ✅
(secondary)		 -4.8% [-5.4%, -4.3%] 2
All ❌✅ (primary) -1.3% [-1.3%, -1.3%] 1

Cycles

Results (secondary 3.5%)

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)		 - - 0
Regressions ❌
(secondary)		 3.5% [2.8%, 5.5%] 12
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 766.815s -> 769.074s (0.29%)
Artifact size: 330.84 MiB -> 330.87 MiB (0.01%)

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
A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. 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
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.