Tweak output of type mismatch between "then" and `else` `if` arms by estebank · Pull Request #57381 · rust-lang/rust

estebank · 2019-01-06T21:39:05Z

error[E0308]: if and else have incompatible types
--> $DIR/if-else-type-mismatch.rs:5:9
|
LL | let _ = if true {
| _____________-
LL | | 42i32
| | ----- expected because of this
LL | | } else {
LL | | 42u32
| | ^^^^^ expected i32, found u32
LL | | };
| |_____- if and else have incompatible types
|
= note: expected type `i32`
found type `u32`
error[E0308]: if and else have incompatible types
--> file.rs:2:38
|
LL | let _ = if false { 3u8; } else { 3u8 };
| ---- ^^^ expected (), found u8
| | |
| | help: consider removing this semicolon
| expected because of this
|
= note: expected type `()`
found type `u8`
error[E0308]: if and else have incompatible types
--> file.rs:3:37
|
LL | let _ = if false { 3u8 } else { 3u8; };
| --- ^^^-
| | | |
| | | help: consider removing this semicolon
| | expected u8, found ()
| expected because of this
|
= note: expected type `u8`
found type `()`
error[E0308]: if and else have incompatible types
--> file.rs:4:37
|
LL | let _ = if false { 3i8 } else { 3u8 };
| --- ^^^ expected i8, found u8
| |
| expected because of this
|
= note: expected type `i8`
found type `u8`

Fix#57348.

rust-highfive · 2019-01-06T21:39:15Z

r? @nikomatsakis

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

nikomatsakis · 2019-01-07T15:12:21Z

@bors r+

bors · 2019-01-07T15:12:24Z

📌 Commit 81f2cf0091fc3bc87db2093edc9b5bfca6797008 has been approved by nikomatsakis

bors · 2019-01-10T06:04:37Z

⌛ Testing commit 81f2cf0091fc3bc87db2093edc9b5bfca6797008 with merge b366f65687a2ede5d206408861828dc32afbd17c...

bors · 2019-01-10T06:04:49Z

💔 Test failed - status-appveyor

emilyalbini · 2019-01-10T08:19:16Z

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

estebank · 2019-01-13T03:37:10Z

rebased to get bors unstuck

@bors r=nikomatsakis

bors · 2019-01-13T03:37:11Z

📌 Commit 54fe1c023a178d6f27c88de90cfdeda926584d19 has been approved by nikomatsakis

@ghost

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 · 2019-01-14T01:11:16Z

☔ The latest upstream changes (presumably #57580) made this pull request unmergeable. Please resolve the merge conflicts.

estebank · 2019-01-14T01:41:09Z

Fixed merge conflict

@bors r=nikomatsakis

bors · 2019-01-14T01:41:09Z

📌 Commit 9567544 has been approved by nikomatsakis

bors · 2019-01-14T03:49:32Z

⌛ Testing commit 9567544 with merge 0bc0015...

Tweak output of type mismatch between "then" and `else` `if` arms ``` error[E0308]: if and else have incompatible types --> $DIR/if-else-type-mismatch.rs:5:9 | LL | let _ = if true { | _____________- LL | | 42i32 | | ----- expected because of this LL | | } else { LL | | 42u32 | | ^^^^^ expected i32, found u32 LL | | }; | |_____- if and else have incompatible types | = note: expected type `i32` found type `u32` error[E0308]: if and else have incompatible types --> file.rs:2:38 | LL | let _ = if false { 3u8; } else { 3u8 }; | ---- ^^^ expected (), found u8 | | | | | help: consider removing this semicolon | expected because of this | = note: expected type `()` found type `u8` error[E0308]: if and else have incompatible types --> file.rs:3:37 | LL | let _ = if false { 3u8 } else { 3u8; }; | --- ^^^- | | | | | | | help: consider removing this semicolon | | expected u8, found () | expected because of this | = note: expected type `u8` found type `()` error[E0308]: if and else have incompatible types --> file.rs:4:37 | LL | let _ = if false { 3i8 } else { 3u8 }; | --- ^^^ expected i8, found u8 | | | expected because of this | = note: expected type `i8` found type `u8` ``` Fix#57348.

bors · 2019-01-14T06:35:44Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: nikomatsakis
Pushing 0bc0015 to master...

rust-highfive assigned nikomatsakis Jan 6, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 6, 2019

nikomatsakis approved these changes Jan 7, 2019
View reviewed changes

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 7, 2019

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

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 force-pushed the if-else-308 branch from 81f2cf0 to 54fe1c0Compare January 13, 2019 03:36

Centril mentioned this pull request Jan 13, 2019
Rollup of 4 pull requests #57580
Merged

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 Jan 14, 2019

estebank added 2 commits January 13, 2019 17:35

Tweak output of type mismatch between "then" and elseif arms
7fc1685

Suggest removal of semicolon when appropriate
9567544

estebank force-pushed the if-else-308 branch from 54fe1c0 to 9567544Compare January 14, 2019 01:37

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 14, 2019

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 14, 2019

bors merged commit 9567544 into rust-lang:masterJan 14, 2019

bors mentioned this pull request Jan 14, 2019
[WIP] HirId-ification #57578
Closed
37 tasks

arielb1 mentioned this pull request Feb 6, 2019
Block expression should warning about missing return value #26577
Closed

estebank deleted the if-else-308 branch November 9, 2023 05:20

Uh oh!

Uh oh!

Conversation

estebank commented Jan 6, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jan 6, 2019

Uh oh!

nikomatsakis commented Jan 7, 2019

Uh oh!

bors commented Jan 7, 2019

Uh oh!

bors commented Jan 10, 2019

Uh oh!

bors commented Jan 10, 2019

Uh oh!

emilyalbini commented Jan 10, 2019

Uh oh!

estebank commented Jan 13, 2019

Uh oh!

bors commented Jan 13, 2019

Uh oh!

bors commented Jan 14, 2019

Uh oh!

estebank commented Jan 14, 2019

Uh oh!

bors commented Jan 14, 2019

Uh oh!

bors commented Jan 14, 2019

Uh oh!

bors commented Jan 14, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

estebank commented Jan 6, 2019•
edited
Loading