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

put type params in front of const params in generics_of #70032

Merged
merged 2 commits into from
Mar 21, 2020

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Mar 15, 2020

fixes #69970

r? @varkor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 15, 2020
@Centril Centril added the F-const_generics `#![feature(const_generics)]` label Mar 15, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Mar 19, 2020

@varkor I spent some time today trying to fix the dependency on param order but did not get a lot done. I am in favor of just doing it like this 😅

@varkor
Copy link
Member

varkor commented Mar 19, 2020

Okay, I'm happy merging this as it is, and I'll try to sort of the generic parameter order thing once and for all later.

Co-Authored-By: varkor <github@varkor.com>
@varkor
Copy link
Member

varkor commented Mar 20, 2020

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 20, 2020

📌 Commit 17c94c6 has been approved by varkor

@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 Mar 20, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2020
Rollup of 6 pull requests

Successful merges:

 - rust-lang#69497 (Don't unwind when hitting the macro expansion recursion limit)
 - rust-lang#69901 (add #[rustc_layout(debug)])
 - rust-lang#69910 (Avoid query type in generics)
 - rust-lang#69955 (Fix abort-on-eprintln during process shutdown)
 - rust-lang#70032 (put type params in front of const params in generics_of)
 - rust-lang#70119 (rustc: use LocalDefId instead of DefId in TypeckTables.)

Failed merges:

r? @ghost
@bors bors merged commit 266801d into rust-lang:master Mar 21, 2020
@lcnr lcnr deleted the issue69970 branch March 21, 2020 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
F-const_generics `#![feature(const_generics)]` 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.

reordering type parameters causes const generics ICE
5 participants