Point at match discriminant on type error in match arm pattern#57366
Merged
bors merged 5 commits intorust-lang:masterfrom Jan 14, 2019
Merged
Point at match discriminant on type error in match arm pattern#57366bors merged 5 commits intorust-lang:masterfrom
bors merged 5 commits intorust-lang:masterfrom
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
estebank
commented
Jan 6, 2019
estebank
commented
Jan 6, 2019
varkor
reviewed
Jan 6, 2019
This comment has been minimized.
This comment has been minimized.
Member
|
@varkor, would you be up for giving this a full review? Since my review backlog has grown a second page over the break, I'm glad about anything that I can hand off |
Contributor
|
r? @varkor I'll take a proper look soon. |
Member
|
Thanks a lot, @varkor! |
varkor
approved these changes
Jan 9, 2019
Contributor
varkor
left a comment
There was a problem hiding this comment.
Looks good! r=me with the updated comment.
Contributor
Author
|
@bors r=varkor |
Collaborator
|
📌 Commit e70390a19e624ee6ff76d427f07d7dc4b040e843 has been approved by |
Collaborator
|
⌛ Testing commit e70390a19e624ee6ff76d427f07d7dc4b040e843 with merge 90db9244e783284768325521220fb2a0cbd6ef05... |
Collaborator
|
💔 Test failed - status-appveyor |
Member
|
@bors retry |
e70390a to
10fbdbf
Compare
Contributor
Author
|
rebased to get bors unstuck @bors r=varkor |
Collaborator
|
📌 Commit 10fbdbf has been approved by |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 13, 2019
Point at match discriminant on type error in match arm pattern
```
error[E0308]: mismatched types
--> src/main.rs:5:9
|
4 | let temp: usize = match a + b {
| ----- this expression has type `usize`
5 | Ok(num) => num,
| ^^^^^^^ expected usize, found enum `std::result::Result`
|
= note: expected type `usize`
found type `std::result::Result<_, _>`
```
Fix rust-lang#57279.
bors
added a commit
that referenced
this pull request
Jan 13, 2019
Rollup of 4 pull requests Successful merges: - #56874 (Simplify foreign type rendering.) - #57113 (Move diagnostics out from QueryJob and optimize for the case with no diagnostics) - #57366 (Point at match discriminant on type error in match arm pattern) - #57538 (librustc_mir: Fix ICE with slice patterns) Failed merges: - #57381 (Tweak output of type mismatch between "then" and `else` `if` arms) r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #57279.