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

Fix const generic arguments not displaying in types mismatch diagnostic #65154

Merged
merged 2 commits into from
Oct 8, 2019
Merged

Fix const generic arguments not displaying in types mismatch diagnostic #65154

merged 2 commits into from
Oct 8, 2019

Conversation

BenLewis-Seequent
Copy link

Fixes #61395

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 6, 2019
@Centril
Copy link
Contributor

Centril commented Oct 6, 2019

r? @varkor

@rust-highfive rust-highfive assigned varkor and unassigned cramertj Oct 6, 2019
@varkor
Copy link
Member

varkor commented Oct 7, 2019

Thanks, this looks great!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 7, 2019

📌 Commit 74eac92 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 Oct 7, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 8, 2019
@Centril
Rollup merge of rust-lang#65154 - skinny121:const-arg-diagnostic, r=v…
ecdb5e9 
…arkor

Fix const generic arguments not displaying in types mismatch diagnostic

Fixes rust-lang#61395
@Centril Centril mentioned this pull request Oct 8, 2019
Merged
bors added a commit that referenced this pull request Oct 8, 2019
@bors
Auto merge of #65196 - Centril:rollup-q06lcxm, r=Centril
1e1f25e 
Rollup of 8 pull requests

Successful merges:

 - #64726 (rewrite documentation for unimplemented! to clarify use)
 - #65040 (syntax: more cleanups in item and function signature parsing)
 - #65046 (Make `Cell::new` method come first in documentation)
 - #65098 (Add long error explanation for E0561)
 - #65150 (Suggest dereferencing boolean reference when used in 'if' or 'while')
 - #65154 (Fix const generic arguments not displaying in types mismatch diagnostic)
 - #65181 (fix bug in folding for constants)
 - #65187 (use 'invalid argument' for vxWorks)

Failed merges:

 - #65179 (Add long error explanation for E0567)

r? @ghost
@Centril Centril added the F-const_generics `#![feature(const_generics)]` label Oct 8, 2019
@bors bors merged commit 74eac92 into rust-lang:master Oct 8, 2019
@bors
Copy link
Contributor

bors commented Oct 8, 2019

☔ The latest upstream changes (presumably #65196) 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 8, 2019
@BenLewis-Seequent BenLewis-Seequent mentioned this pull request Oct 8, 2019
Merged
@varkor varkor mentioned this pull request Oct 19, 2019
Closed
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fbstj fbstj fbstj left review comments

Assignees

@varkor varkor

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Const-generic arguments are not printed in error messages
8 participants
@BenLewis-Seequent @rust-highfive @Centril @varkor @bors @fbstj @cramertj @skinnyBat