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

Point at appropriate arm on type error on if/else/match with one non-! arm #64083

Merged
merged 3 commits into from
Sep 5, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Sep 2, 2019

Fix #61281.

@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 Sep 2, 2019
@estebank
Copy link
Contributor Author

estebank commented Sep 2, 2019

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned cramertj Sep 2, 2019
src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved
src/librustc_typeck/check/mod.rs Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Sep 5, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Sep 5, 2019

📌 Commit c430d74 has been approved by oli-obk

@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 Sep 5, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
Point at appropriate arm on type error on if/else/match with one non-! arm

Fix rust-lang#61281.
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
Point at appropriate arm on type error on if/else/match with one non-! arm

Fix rust-lang#61281.
bors added a commit that referenced this pull request Sep 5, 2019
Rollup of 11 pull requests

Successful merges:

 - #62848 (Use unicode-xid crate instead of libcore)
 - #63774 (Fix `window.hashchange is not a function`)
 - #63930 (Account for doc comments coming from proc macros without spans)
 - #64003 (place: Passing `align` = `layout.align.abi`, when also passing `layout`)
 - #64030 (Fix unlock ordering in SGX synchronization primitives)
 - #64041 (use TokenStream rather than &[TokenTree] for built-in macros)
 - #64051 (Add x86_64-linux-kernel target)
 - #64063 (Fix const_err with `-(-0.0)`)
 - #64083 (Point at appropriate arm on type error on if/else/match with one non-! arm)
 - #64100 (Fix const eval bug breaking run-pass tests in Miri)
 - #64157 (Opaque type locations in error message for clarity.)

Failed merges:

r? @ghost
@bors bors merged commit c430d74 into rust-lang:master Sep 5, 2019
@estebank estebank deleted the tweak-e0308 branch November 9, 2023 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mismatched types error involving if/else expressions should point at
6 participants