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

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

Merged
merged 2 commits into from Oct 8, 2019

Conversation

@skinny121
Copy link
Contributor

skinny121 commented Oct 6, 2019

Fixes #61395

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Oct 6, 2019

r? @cramertj

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

@Centril

This comment has been minimized.

Copy link
Member

Centril commented Oct 6, 2019

r? @varkor

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

This comment has been minimized.

Copy link
Member

varkor commented Oct 7, 2019

Thanks, this looks great!

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Oct 7, 2019

📌 Commit 74eac92 has been approved by varkor

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
@Centril Centril referenced this pull request Oct 8, 2019
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
@bors bors merged commit 74eac92 into rust-lang:master Oct 8, 2019
4 checks passed
4 checks passed
pr Build #20191007.11 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 8, 2019

☔️ The latest upstream changes (presumably #65196) 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
7 participants
You can’t perform that action at this time.