Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
BenLewis-Seequent:const-arg-diagnostic
Oct 8, 2019
Merged

bors merged 2 commits into
rust-lang:masterfrom
BenLewis-Seequent:const-arg-diagnostic

Conversation

@BenLewis-Seequent

Copy link
Copy Markdown

Fixes #61395

@rust-highfive

Copy link
Copy Markdown
Contributor

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
Comment thread src/librustc/infer/error_reporting/mod.rs
@Centril

Centril commented Oct 6, 2019

Copy link
Copy Markdown
Contributor

r? @varkor

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

varkor commented Oct 7, 2019

Copy link
Copy Markdown
Contributor

Thanks, this looks great!

@bors r+ rollup

@bors

bors commented Oct 7, 2019

Copy link
Copy Markdown
Collaborator

📌 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
…arkor

Fix const generic arguments not displaying in types mismatch diagnostic

Fixes rust-lang#61395
bors added a commit that referenced this pull request Oct 8, 2019
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

bors commented Oct 8, 2019

Copy link
Copy Markdown
Collaborator

☔ 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
@varkor varkor mentioned this pull request Oct 19, 2019
3 of 16 tasks
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.

Const-generic arguments are not printed in error messages

8 participants