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

update const generics feature gates #88369

Merged
merged 5 commits into from
Aug 31, 2021
Merged

update const generics feature gates #88369

merged 5 commits into from
Aug 31, 2021

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Aug 26, 2021

tl;dr: split const generics into three features: adt_const_params, const_generics_defaults and generic_const_exprs

continuing the work of @BoxyUwU in #88324, this PR

  • renames feature(const_evaluatable_checked) to feature(generic_const_exprs) which now doesn't need any other feature gate to work. Previously feature(const_evaluatable_checked) was only useful in combination with feature(const_generics).
  • completely removes feature(lazy_normalization_consts). This feature only supplied the parents generics to anonymous constants, which is pretty useless as generic anon consts are only allowed with feature(generic_const_exprs) anyways.
  • moves the ability to use additional const param types from feature(const_generics) into feature(adt_const_params). As feature(const_generics) is now mostly useless without feature(generic_const_exprs) we also remove that feature flag.
  • updates tests, removing duplicates and unnecessary revisions in some cases and also deletes all unused *.stderr files.

I not also remove the ordering restriction for const and type parameters if any of the three const generics features is active.
This ordering restriction feels like the only "real" use of the current feature(const_generics) right now so this change isn't a perfect solution, but as I intend to stabilize the ordering - and feature(const_generics_defaults) - in the very near future, I think this is acceptable for now.


cc @rust-lang/project-const-generics about the new feature names and this change in general.

I don't think we need any external approval for this change but I do intend to publish an update to the const generics tracking issue the day this PR lands, so I don't want this merged yet.

Apologies to whoever ends up reviewing this PR 😅 ❤️

r? rust-lang/project-const-generics

@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rust-highfive
Copy link
Collaborator

r? @estebank

(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 Aug 26, 2021
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Aug 27, 2021

☔ The latest upstream changes (presumably #87280) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-log-analyzer

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Aug 27, 2021

@bors r+ p=1 (bitrotty)

@bors
Copy link
Contributor

bors commented Aug 27, 2021

📌 Commit 18abdf4c3a902d0d9c86c4fa3cb78ecbd3534b91 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 Aug 27, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Aug 27, 2021

@bors r-

r=me

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 27, 2021
@flip1995
Copy link
Member

flip1995 commented Aug 27, 2021

Something looks really wrong with the Clippy changes. There are many stderr files that just got removed, which should be entirely unrelated to this PR.

Also this PR shows +910 −12,110, which just seems really sus.

@lcnr
Copy link
Contributor Author

lcnr commented Aug 27, 2021

There are many stderr files that just got removed, which should be entirely unrelated to this PR.

During this PR i've removed all *.stderr files to prevent any leftover ones due to revision changes. This seems to also affect parts of clippy which are not relevant for CI. Reverted the clippy changes.

The reason for the large diff is that there were a bunch of nll revisions which have later been removed without removing the .nll.stderr files, so that explains most of the deleted lines of this PR.

Going to look through all changed files to check if there is anything else that's suspicious.

@rust-log-analyzer

This comment has been minimized.

@lcnr
Copy link
Contributor Author

lcnr commented Aug 27, 2021

Alright, I did remove stderr files of optionally ignored tests, so I added these back in. The remaining stderr files I've removed should all be from revisions which no longer exist. These missing stderr files would trigger a CI error when testing on the relevant platform, so it would have been fine to try and merge it as is.

@oli-obk
Copy link
Contributor

oli-obk commented Aug 27, 2021

@bors r+ p=1 (bitrotty)

@bors
Copy link
Contributor

bors commented Aug 27, 2021

📌 Commit 68adb08aed0d319e71d55172288061ebdaa43343 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 27, 2021
@flip1995
Copy link
Member

Clippy changes LGTM now 👍 Thanks!

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Aug 30, 2021

📌 Commit 87e7817 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 Aug 30, 2021
@bors
Copy link
Contributor

bors commented Aug 30, 2021

⌛ Testing commit 87e7817 with merge 1f465c603f864dbf5951a154e8eb9d1b66f40d8e...

@bors
Copy link
Contributor

bors commented Aug 30, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 30, 2021
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@lcnr
Copy link
Contributor Author

lcnr commented Aug 30, 2021

this looks spurious again? not going to retry this PR right now as the bors queue seems to be quite full and I am not certain this is spurious

@jyn514
Copy link
Member

jyn514 commented Aug 30, 2021

x86_64-apple failed after 2 hours without logs

@bors retry

@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 Aug 30, 2021
@bors
Copy link
Contributor

bors commented Aug 30, 2021

⌛ Testing commit 87e7817 with merge 6f388bb...

@bors
Copy link
Contributor

bors commented Aug 31, 2021

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 6f388bb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2021
@bors bors merged commit 6f388bb into rust-lang:master Aug 31, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 31, 2021
@bors bors mentioned this pull request Aug 31, 2021
@lcnr lcnr deleted the cec-rename branch August 31, 2021 09:53
Alexendoo added a commit to Alexendoo/glacier that referenced this pull request Sep 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants