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 5 pull requests #127414

Merged
merged 14 commits into from
Jul 6, 2024
Merged

Rollup of 5 pull requests #127414

merged 14 commits into from
Jul 6, 2024

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Oneirical and others added 14 commits July 5, 2024 10:19
@Oneirical
rewrite output-type-permutations to rmake
3cdce7e
@Oneirical
add shallow_find_files helper to run_make_support
7399471
@Oneirical
Expectations struct for output-type-permutations
811532b
@Jules-Bertholet
Rename edition 2021 fail test
5fd5b65
@Jules-Bertholet
Match ergonomics 2024: & matches &mut on old editions
5a35fc4
@Jules-Bertholet
Match ergonomics 2024: test type inference
76da7ae
@estebank
Use verbose style for argument removal suggestion
8e9a366
@estebank
Use verbose suggestion for changing arg type
7569205
@pitaj
add new_range_api for RFC 3550
ffea65b 
This includes a `From<legacy::RangeInclusive> for RangeInclusive` impl for convenience, instead of the `TryFrom` impl from the RFC.
Having `From` is highly convenient and the assertion is unlikely to be a problem in practice.

This includes re-exports of all existing `Range` types under `core::range`, plus the range-related traits (`RangeBounds`, `Step`, `OneSidedRange`) and the `Bound` enum.

Currently the iterators are just wrappers around the old range types,
and most other trait impls delegate to the old rage types as well.

Also includes an `.iter()` shorthand for `.clone().into_iter()`
@workingjubilee
Rollup merge of rust-lang#125751 - pitaj:new_range_api, r=jhpratt
9c8a889 
Add `new_range_api` for RFC 3550

Initial implementation for rust-lang#125687

This includes a `From<legacy::RangeInclusive> for RangeInclusive` impl for convenience, instead of the `TryFrom` impl from the RFC. Having `From` is highly convenient and the debug assert should find almost all misuses.

This includes re-exports of all existing `Range` types under `core::range`, plus the range-related traits (`RangeBounds`, `Step`, `OneSidedRange`) and the `Bound` enum.

Currently the iterators are just wrappers around the old range types.

Tracking issues:

- rust-lang#123741
- rust-lang#125687
@workingjubilee
Rollup merge of rust-lang#127098 - Oneirical:big-test-party, r=Kobzol…
0262972 
…,jieyouxu

Migrate `output-type-permutations` `run-make` test to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

try-job: x86_64-msvc
try-job: armhf-gnu
try-job: aarch64-apple
try-job: test-various
@workingjubilee
Rollup merge of rust-lang#127369 - Jules-Bertholet:match-ergonomics-2…
3ba4195 
…021, r=Nadrieril

Match ergonomics 2024: align with RFC again

- `&` matches `&mut` on old editions
- Add some more tests

r? ``@Nadrieril``

cc rust-lang#123076

``@rustbot`` label A-edition-2024 A-patterns
@workingjubilee
Rollup merge of rust-lang#127383 - estebank:arg-removal, r=compiler-e…
d0f61ce 
…rrors

Use verbose style for argument removal suggestion
@workingjubilee
Rollup merge of rust-lang#127392 - estebank:arg-type, r=jieyouxu
8531487 
Use verbose suggestion for changing arg type
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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. rollup A PR which is a rollup labels Jul 6, 2024
@workingjubilee
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jul 6, 2024

📌 Commit 8531487 has been approved by workingjubilee

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

bors commented Jul 6, 2024

⌛ Testing commit 8531487 with merge 28cc0b6...

@bors
Copy link
Contributor

bors commented Jul 6, 2024

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 28cc0b6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2024
@bors bors merged commit 28cc0b6 into rust-lang:master Jul 6, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 6, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#125751 Add new_range_api for RFC 3550 b87f1bd560d8645d449af8fba92c5e602ee2506f (link)
#127098 Migrate output-type-permutations run-make test to rmake 606f14f061e6cb38c35406c3a3f30c4820caa668 (link)
#127369 Match ergonomics 2024: align with RFC again 7d3c748c631dba39888b21dd370902457cc02226 (link)
#127383 Use verbose style for argument removal suggestion 92bf1b343bca46df9f514bee74377b4f0cb8fa9c (link)
#127392 Use verbose suggestion for changing arg type cb417050037744cf4a062ab7ced5f749511768bc (link)

previous master: 51917e2e69

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (28cc0b6): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.8% [0.5%, 1.2%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.1% [-0.1%, -0.1%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.2%, secondary 0.4%)

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.8% [0.8%, 0.8%] 1
Regressions ❌
(secondary)		 0.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)		 -0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.2% [-0.4%, 0.8%] 2

Cycles

Results (primary 2.2%, secondary -2.2%)

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)		 2.2% [2.2%, 2.2%] 1
Regressions ❌
(secondary)		 1.7% [0.5%, 2.2%] 7
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -4.3% [-6.3%, -0.7%] 13
All ❌✅ (primary) 2.2% [2.2%, 2.2%] 1

Binary size

Results (primary 0.0%)

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.0% [0.0%, 0.0%] 8
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.0% [0.0%, 0.0%] 8

Bootstrap: 697.532s -> 697.348s (-0.03%)
Artifact size: 328.20 MiB -> 328.28 MiB (0.02%)

@workingjubilee workingjubilee deleted the rollup-lcxw1eh branch July 7, 2024 01:22
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-run-make Area: port run-make Makefiles to rmake.rs 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.
Projects
Oxidizing run-make tests
Status: Done
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
8 participants
@workingjubilee @bors @rust-timer @rustbot @Oneirical @Jules-Bertholet @estebank @pitaj