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

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

Merged

Conversation

@varkor
Copy link
Member

varkor commented Oct 20, 2019

This fixes a mistake, but not #65623.

r? @eddyb

@varkor varkor force-pushed the varkor:remove-free-regions-from-const-placeholder branch from 174ac11 to 205e846 Oct 25, 2019
@varkor varkor force-pushed the varkor:remove-free-regions-from-const-placeholder branch from 205e846 to 6661db0 Oct 25, 2019
@eddyb
eddyb approved these changes Oct 28, 2019
@eddyb

This comment has been minimized.

Copy link
Member

eddyb commented Oct 28, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 28, 2019

📌 Commit 6661db0 has been approved by eddyb

@varkor

This comment has been minimized.

Copy link
Member 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
4 checks passed
4 checks passed
pr Build #20191025.112 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 29, 2019

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.