Skip to content

Conversation

varkor
Copy link
Contributor

@varkor varkor commented Oct 20, 2019

This fixes a mistake, but not #65623.

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2019
@varkor varkor added the F-const_generics `#![feature(const_generics)]` label Oct 20, 2019
@varkor varkor force-pushed the remove-free-regions-from-const-placeholder branch from 174ac11 to 205e846 Compare October 25, 2019 22:36
@varkor varkor force-pushed the remove-free-regions-from-const-placeholder branch from 205e846 to 6661db0 Compare October 25, 2019 22:38
@eddyb
Copy link
Member

eddyb commented Oct 28, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 28, 2019

📌 Commit 6661db0 has been approved by eddyb

@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 Oct 28, 2019
@varkor
Copy link
Contributor Author

varkor commented Oct 28, 2019

@bors rollup

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 28, 2019
…st-placeholder, r=eddyb

Correct handling of type flags with `ConstValue::Placeholder`

This fixes a mistake, but not rust-lang#65623.

r? @eddyb
Centril added a commit to Centril/rust that referenced this pull request Oct 28, 2019
…st-placeholder, r=eddyb

Correct handling of type flags with `ConstValue::Placeholder`

This fixes a mistake, but not rust-lang#65623.

r? @eddyb
bors added a commit that referenced this pull request Oct 28, 2019
Rollup of 9 pull requests

Successful merges:

 - #65563 (Add long error explanation for E0587)
 - #65640 (Use heuristics to recover parsing of missing `;`)
 - #65643 (Correct handling of type flags with `ConstValue::Placeholder`)
 - #65825 (rustc: use IndexVec<DefIndex, T> instead of Vec<T>.)
 - #65858 (suggest `const_in_array_repeat_expression` flag)
 - #65877 (doc: introduce `once` in `iter::chain` document)
 - #65887 (doc: mention `get(_mut)` in Vec)
 - #65891 (self-profiling: Record something more useful for crate metadata generation event.)
 - #65893 (Output previous stable  error messaging when using stable build.)

Failed merges:

r? @ghost
@bors bors merged commit 6661db0 into rust-lang:master Oct 29, 2019
@bors
Copy link
Collaborator

bors commented Oct 29, 2019

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

@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 Oct 29, 2019
@varkor varkor deleted the remove-free-regions-from-const-placeholder branch January 2, 2020 11:55
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-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants