Skip to content

correctly handle const params in type_of - #70284

Merged
bors merged 3 commits into
rust-lang:masterfrom
lcnr:issue70273-what-the-heck-git
Mar 24, 2020
Merged

correctly handle const params in type_of#70284
bors merged 3 commits into
rust-lang:masterfrom
lcnr:issue70273-what-the-heck-git

Conversation

@lcnr

@lcnrlcnr commented Mar 22, 2020

Copy link
Copy Markdown
Contributor

extends #70223, retry of #70276

fixes#70273

r? @eddyb cc @varkor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 22, 2020
@varkorvarkor added the F-const_generics `#![feature(const_generics)]` label Mar 22, 2020
Comment threadsrc/librustc_typeck/collect/type_of.rs Outdated
Comment threadsrc/librustc_typeck/collect/type_of.rs Outdated
@eddyb

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 6a7106c has been approved by eddyb

@borsbors 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 23, 2020
@eddyb

Copy link
Copy Markdown
Contributor

@bors r- (GitHub hid my comment and I forgot I'd just left it...)

@borsbors 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 Mar 23, 2020
@lcnr

lcnr commented Mar 23, 2020

Copy link
Copy Markdown
ContributorAuthor

ready for merge I guess.

@eddyb

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0a17c4c has been approved by eddyb

@borsbors 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 Mar 23, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 24, 2020
@CentrilCentril mentioned this pull request Mar 24, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 24, 2020
@CentrilCentril mentioned this pull request Mar 24, 2020
@CentrilCentril mentioned this pull request Mar 24, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2020
Rollup of 8 pull requests
Successful merges:
- rust-lang#68884 (Make the `type_of` return a generic type for generators)
- rust-lang#69788 (Fix sequence of Type and Trait in optin-builtin-traits in Unstable Book)
- rust-lang#70074 (Expand: nix all fatal errors)
- rust-lang#70077 (Store idents for `DefPathData` into crate metadata)
- rust-lang#70213 (traits/fulfill: allow `stalled_on` to track `ty::Const::Infer(_)` (unused yet).)
- rust-lang#70259 (Use Reveal::All in MIR optimizations)
- rust-lang#70284 (correctly handle const params in type_of)
- rust-lang#70289 (Refactor `codegen`)
Failed merges:
r? @ghost
@bors
bors merged commit d309058 into rust-lang:masterMar 24, 2020
@lcnr
lcnr deleted the issue70273-what-the-heck-git branch March 24, 2020 10:46
@steffahnsteffahn mentioned this pull request May 3, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

F-const_generics`#![feature(const_generics)]`S-waiting-on-borsStatus: 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.

ICE when using const generics with associated items

5 participants

@lcnr@eddyb@bors@varkor@rust-highfive