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

Fix some diagnostic issues with const_generics_defaults feature gate #85800

Merged
merged 4 commits into from Jun 12, 2021

Conversation

BoxyUwU
Copy link
Member

@BoxyUwU BoxyUwU commented May 29, 2021

This PR makes a few changes:

  • print out const param defaults in "lifetime ordering" errors rather than discarding them
  • update is_simple_text to account for const params when checking if a type has no generics, this was causing a note to be failed to add to an error message
  • fixes some diagnostic wording that incorrectly said there was ordering restrictions between type/const params despite the const_generics_defaults feature gate is active

@rust-highfive
Copy link
Collaborator

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Jun 7, 2021

r? @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Jun 10, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 10, 2021

📌 Commit 47fe696 has been approved by oli-obk

@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 Jun 10, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 11, 2021
…tics, r=oli-obk

Fix some diagnostic issues with const_generics_defaults feature gate

This PR makes a few changes:
- print out const param defaults in "lifetime ordering" errors rather than discarding them
- update `is_simple_text` to account for const params when checking if a type has no generics, this was causing a note to be failed to add to an error message
- fixes some diagnostic wording that incorrectly said there was ordering restrictions between type/const params despite the `const_generics_defaults` feature gate is active
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 11, 2021
…tics, r=oli-obk

Fix some diagnostic issues with const_generics_defaults feature gate

This PR makes a few changes:
- print out const param defaults in "lifetime ordering" errors rather than discarding them
- update `is_simple_text` to account for const params when checking if a type has no generics, this was causing a note to be failed to add to an error message
- fixes some diagnostic wording that incorrectly said there was ordering restrictions between type/const params despite the `const_generics_defaults` feature gate is active
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 12, 2021
Rollup of 7 pull requests

Successful merges:

 - rust-lang#85800 (Fix some diagnostic issues with const_generics_defaults feature gate)
 - rust-lang#85823 (Do not suggest ampmut if rhs is already mutable)
 - rust-lang#86153 (Print dummy spans as `no-location`)
 - rust-lang#86174 (Detect incorrect vtable alignment during const eval)
 - rust-lang#86189 (Make `relate_type_and_mut` public)
 - rust-lang#86205 (Run full const-generics test for issue-72293)
 - rust-lang#86217 (Remove "generic type" in boxed.rs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3b47d33 into rust-lang:master Jun 12, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 12, 2021
@lcnr lcnr added the A-const-generics Area: const generics (parameters and arguments) label Dec 11, 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) 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.

None yet

7 participants