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

[beta] backports #136980

Merged
merged 18 commits into from
Feb 13, 2025
Merged

[beta] backports #136980

merged 18 commits into from
Feb 13, 2025

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Feb 13, 2025

r? cuviper

dianne and others added 18 commits February 10, 2025 23:08
@dianne
pattern migration: move labels out of the suggestion struct
acec586 
(cherry picked from commit 724b885)
@dianne
reword pattern migration diagnostic to make sense in all editions
1a18daa 
This aligns the main error message a bit more with the phrasing in the
Edition Guide and provides a bit more information on the labels to
(hopefully!) aid in understanding.

(cherry picked from commit bdc6c4d)
@dianne
use more specific wording for subpatterns from macro expansions
a9465de 
(cherry picked from commit bbe40ac)
@dianne
add tests for label formatting
f8b23cd 
(cherry picked from commit 9202001)
@dianne
highlight the whole problem subpattern when pointing out the default …
2ee601c 
…binding mode

(cherry picked from commit 4331f55)
@dianne
experimentally label the spans for default binding modes
6ff2d19 
(cherry picked from commit 203d310)
@dianne
don't include trailing open parens in labels for reference patterns
97cb2d5 
(cherry picked from commit a064e78)
@dianne
separate labels for default binding mode spans into their own notes
215bfdd 
(cherry picked from commit 767f820)
@dianne
reword default binding mode notes
ee0838f 
(cherry picked from commit a5cc4cb)
@dianne
peace of mind: remove a call to Option::expect
2f29577 
(cherry picked from commit 060cc37)
@dianne
try to suggest eliding redundant binding modifiers
909010e 
(cherry picked from commit b32a533)
@dianne
peace of mind: be absolutely sure we don't try to emit a 0-part sugge…
c8e8068 
…stion

(cherry picked from commit 8dcdb3e)
@dianne
add more pattern migration tests
8ee0fcb 
Most of these are meant to test possible future improvements, but since
they cover cases the existing test suite didn't, I figure including them
now may be helpful.

(cherry picked from commit f1e4d94)
@lsunsi @cuviper
chore: update rustc-hash 2.1.0 to 2.1.1
f5be3c8 
(cherry picked from commit 62c2f65)
@steffahn @cuviper
Make AsyncFnOnce, AsyncFnMut, AsyncFn non-#[fundamental]
e3bcb72 
(cherry picked from commit 7155382)
@cuviper
add test for const type_id misoptimization
4991b29 
(cherry picked from commit 4898753)
@cuviper
fix ensure_monomorphic_enough
a061e7e 
(cherry picked from commit c1da4f1)
@workingjubilee @cuviper
Revert "Stabilize extended_varargs_abi_support"
e5ba20b 
This reverts commit 685f189.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. labels Feb 13, 2025
@cuviper cuviper mentioned this pull request Feb 13, 2025
Closed
@cuviper
Copy link
Member Author

cuviper commented Feb 13, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Feb 13, 2025

📌 Commit e5ba20b has been approved by cuviper

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 Feb 13, 2025
This was referenced Feb 13, 2025
Merged
Closed
@bors
Copy link
Contributor

bors commented Feb 13, 2025

⌛ Testing commit e5ba20b with merge 461de74...

@bors
Copy link
Contributor

bors commented Feb 13, 2025

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 461de74 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 13, 2025
@bors bors merged commit 461de74 into rust-lang:beta Feb 13, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Feb 13, 2025
@steffahn steffahn mentioned this pull request Feb 14, 2025
Closed
@cuviper cuviper deleted the beta-next branch February 17, 2025 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
7 participants
@cuviper @bors @rustbot @dianne @lsunsi @steffahn @workingjubilee