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

Point at match discriminant on type error in match arm pattern #57366

Merged
merged 5 commits into from
Jan 14, 2019
Merged

Point at match discriminant on type error in match arm pattern #57366

merged 5 commits into from
Jan 14, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jan 6, 2019 •
edited
Loading 

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 #57279.

@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(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 Jan 6, 2019
@estebank estebank changed the title Point at the match discriminant when arm pattern has a type mismatch Point at match discrimant on type error in match arm pattern Jan 6, 2019
@estebank estebank changed the title Point at match discrimant on type error in match arm pattern Point at match discriminant on type error in match arm pattern Jan 6, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@michaelwoerister
Copy link
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 :)

@varkor
Copy link
Member

varkor commented Jan 7, 2019

r? @varkor

I'll take a proper look soon.

@michaelwoerister
Copy link
Member

Thanks a lot, @varkor!

varkor
varkor approved these changes Jan 9, 2019
View reviewed changes
Copy link
Member

@varkor varkor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! r=me with the updated comment.

src/librustc_typeck/check/_match.rs Show resolved Hide resolved
@estebank
Copy link
Contributor Author

estebank commented Jan 9, 2019

@bors r=varkor

@bors
Copy link
Contributor

bors commented Jan 9, 2019

📌 Commit e70390a19e624ee6ff76d427f07d7dc4b040e843 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 Jan 9, 2019
@bors
Copy link
Contributor

bors commented Jan 10, 2019

⌛ Testing commit e70390a19e624ee6ff76d427f07d7dc4b040e843 with merge 90db9244e783284768325521220fb2a0cbd6ef05...

@bors
Copy link
Contributor

bors commented Jan 10, 2019

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 10, 2019
@pietroalbini
Copy link
Member

@bors retry
AppVeyor... what's wrong with you today?

@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 Jan 10, 2019
@estebank estebank force-pushed the point-match-discrim branch from e70390a to 10fbdbf Compare January 13, 2019 03:36
@estebank
Copy link
Contributor Author

rebased to get bors unstuck

@bors r=varkor

@bors
Copy link
Contributor

bors commented Jan 13, 2019

📌 Commit 10fbdbf has been approved by varkor

Centril added a commit to Centril/rust that referenced this pull request Jan 13, 2019
@Centril
Rollup merge of rust-lang#57366 - estebank:point-match-discrim, r=varkor
d7c1e0d 
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.
@Centril Centril mentioned this pull request Jan 13, 2019
Merged
bors added a commit that referenced this pull request Jan 13, 2019
@bors
Auto merge of #57580 - Centril:rollup, r=Centril
9aee7ed 
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
@bors bors merged commit 10fbdbf into rust-lang:master Jan 14, 2019
@estebank estebank deleted the point-match-discrim branch November 9, 2023 05:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@varkor varkor varkor approved these changes

Assignees

@varkor varkor

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@estebank @rust-highfive @michaelwoerister @varkor @bors @pietroalbini