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.

Sign up for GitHub

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

Jump to bottom

Add type to ConstKind::Placeholder #78463

Merged
merged 1 commit into from
Nov 13, 2020
Merged

Add type to ConstKind::Placeholder #78463

merged 1 commit into from
Nov 13, 2020

Conversation

varkor
Copy link
Member

@varkor varkor commented Oct 28, 2020 •
edited
Loading

I simply threaded <'tcx> through everything that required it. I'm not sure whether this is the correct thing to do, but it seems to work.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 28, 2020
@varkor varkor added the A-const-generics Area: const generics (parameters and arguments) label Oct 28, 2020
@varkor varkor marked this pull request as draft October 28, 2020 01:19
@varkor varkor force-pushed the placeholder-const branch from e7fd4fe to eb40907 Compare October 28, 2020 02:08
@varkor varkor marked this pull request as ready for review October 28, 2020 02:25
@varkor varkor force-pushed the placeholder-const branch from eb40907 to 8014f1e Compare October 28, 2020 10:38
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 12, 2020

📌 Commit e24a4b4 has been approved by nikomatsakis

@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 Nov 12, 2020
@GuillaumeGomez GuillaumeGomez mentioned this pull request Nov 13, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2020
@bors
Auto merge of rust-lang#79017 - GuillaumeGomez:rollup-5orhudd, r=Guil…
f2a11a2 
…laumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#77151 (Add regression test for issue rust-lang#76042)
 - rust-lang#77996 (Doc change: Remove mention of `fnv` in HashMap)
 - rust-lang#78463 (Add type to `ConstKind::Placeholder`)
 - rust-lang#78984 (Rustdoc check option)
 - rust-lang#78985 (add dropck test for const params)
 - rust-lang#78996 (add explicit test for const param promotion)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0b7a793 into rust-lang:master Nov 13, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 13, 2020
@varkor varkor deleted the placeholder-const branch November 13, 2020 17:54
@lcnr lcnr mentioned this pull request Nov 17, 2020
Closed
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

@nikomatsakis nikomatsakis nikomatsakis requested changes

Assignees

@nikomatsakis nikomatsakis

Labels
A-const-generics Area: const generics (parameters and arguments) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.50.0
Development

Successfully merging this pull request may close these issues.
6 participants
@varkor @nikomatsakis @bors @lcnr @rust-highfive @rustbot