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.

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

Make SelfInTyParamDefault wording not be specific to type defaults #87134

Merged
merged 2 commits into from
Jul 15, 2021

Conversation

BoxyUwU
Copy link
Member

@BoxyUwU BoxyUwU commented Jul 14, 2021

r? @lcnr

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 14, 2021
@lcnr lcnr added A-const-generics Area: const generics (parameters and arguments) F-const_generics_defaults `#![feature(const_generics_defaults)]` labels Jul 14, 2021
@lcnr
Copy link
Contributor

lcnr commented Jul 14, 2021

@bors r+ rollup

I think differentiating between const and type parameters in this error message wouldn't be helpful as otherwise people might think that it works for the other kind when getting this error message, so using "generic" here seems like the best solution to me.

@bors
Copy link
Contributor

bors commented Jul 14, 2021

📌 Commit da189d9 has been approved by lcnr

@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 14, 2021
@BoxyUwU
Copy link
Member Author

BoxyUwU commented Jul 14, 2021

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jul 14, 2021

📌 Commit b3b6b66 has been approved by lcnr

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 15, 2021
Make SelfInTyParamDefault wording not be specific to type defaults

r? `@lcnr`
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 15, 2021
Make SelfInTyParamDefault wording not be specific to type defaults

r? ``@lcnr``
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 15, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#85579 (Added Arc::try_pin)
 - rust-lang#86478 (Add -Zfuture-incompat-test to assist with testing future-incompat reports.)
 - rust-lang#86947 (Move assert_matches to an inner module)
 - rust-lang#87081 (Add tracking issue number to `wasi_ext`)
 - rust-lang#87127 (Add safety comments in private core::slice::rotate::ptr_rotate function)
 - rust-lang#87134 (Make SelfInTyParamDefault wording not be specific to type defaults)
 - rust-lang#87147 (Update cargo)
 - rust-lang#87154 (Fix misuse of rev attribute on <a> tag)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6d0d80e into rust-lang:master Jul 15, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-const-generics Area: const generics (parameters and arguments) F-const_generics_defaults `#![feature(const_generics_defaults)]` 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.

5 participants