wip

Author: Centril

Diff for: src/test/ui/if/if-let-arm-types.rs

@@ -1,11 +1,12 @@
 fn main() {
     if let Some(b) = None {
-        //~^ NOTE if let` arms have incompatible types
+        //~^ NOTE if and else have incompatible types
         ()
+        //~^ NOTE expected because of this
     } else {
         1
     };
-    //~^^ ERROR: `if let` arms have incompatible types
+    //~^^ ERROR: if and else have incompatible types
     //~| NOTE expected (), found integer
     //~| NOTE expected type `()`
 }

Diff for: src/test/ui/if/if-let-arm-types.stderr

@@ -1,10 +1,11 @@
 error[E0308]: if and else have incompatible types
-  --> $DIR/if-let-arm-types.rs:6:9
+  --> $DIR/if-let-arm-types.rs:7:9
    |
 LL | /     if let Some(b) = None {
 LL | |
 LL | |         ()
    | |         -- expected because of this
+LL | |
 LL | |     } else {
 LL | |         1
    | |         ^ expected (), found integer

Diff for: src/test/ui/if/if-without-else-as-fn-expr.rs

@@ -3,13 +3,15 @@ fn foo(bar: usize) -> usize {
         return 3;
     }
     //~^^^ ERROR if may be missing an else clause
+    //~| ERROR mismatched types [E0308]
 }
 
 fn foo2(bar: usize) -> usize {
     let x: usize = if bar % 5 == 0 {
         return 3;
     };
     //~^^^ ERROR if may be missing an else clause
+    //~| ERROR mismatched types [E0308]
     x
 }
 
@@ -18,6 +20,7 @@ fn foo3(bar: usize) -> usize {
         3
     }
     //~^^^ ERROR if may be missing an else clause
+    //~| ERROR mismatched types [E0308]
 }
 
 fn foo_let(bar: usize) -> usize {
@@ -45,4 +48,3 @@ fn foo3_let(bar: usize) -> usize {
 fn main() {
     let _ = foo(1);
 }
-

Diff for: src/test/ui/if/if-without-else-as-fn-expr.stderr

@@ -25,7 +25,7 @@ LL | |     }
    = help: consider adding an `else` block that evaluates to the expected type
 
 error[E0308]: mismatched types
-  --> $DIR/if-without-else-as-fn-expr.rs:9:20
+  --> $DIR/if-without-else-as-fn-expr.rs:10:20
    |
 LL |       let x: usize = if bar % 5 == 0 {
    |  ____________________^
@@ -37,7 +37,7 @@ LL | |     };
               found type `()`
 
 error[E0317]: if may be missing an else clause
-  --> $DIR/if-without-else-as-fn-expr.rs:9:20
+  --> $DIR/if-without-else-as-fn-expr.rs:10:20
    |
 LL |       let x: usize = if bar % 5 == 0 {
    |  _________-__________^
@@ -53,7 +53,7 @@ LL | |     };
    = help: consider adding an `else` block that evaluates to the expected type
 
 error[E0308]: mismatched types
-  --> $DIR/if-without-else-as-fn-expr.rs:17:5
+  --> $DIR/if-without-else-as-fn-expr.rs:19:5
    |
 LL | /     if bar % 5 == 0 {
 LL | |         3
@@ -64,7 +64,7 @@ LL | |     }
               found type `()`
 
 error[E0317]: if may be missing an else clause
-  --> $DIR/if-without-else-as-fn-expr.rs:17:5
+  --> $DIR/if-without-else-as-fn-expr.rs:19:5
    |
 LL |   fn foo3(bar: usize) -> usize {
    |                          ----- expected `usize` because of this return type
@@ -79,7 +79,7 @@ LL | |     }
    = help: consider adding an `else` block that evaluates to the expected type
 
 error[E0317]: if may be missing an else clause
-  --> $DIR/if-without-else-as-fn-expr.rs:24:5
+  --> $DIR/if-without-else-as-fn-expr.rs:27:5
    |
 LL |   fn foo_let(bar: usize) -> usize {
    |                             ----- expected `usize` because of this return type
@@ -94,7 +94,7 @@ LL | |     }
    = help: consider adding an `else` block that evaluates to the expected type
 
 error[E0317]: if may be missing an else clause
-  --> $DIR/if-without-else-as-fn-expr.rs:31:20
+  --> $DIR/if-without-else-as-fn-expr.rs:34:20
    |
 LL |       let x: usize = if let 0 = 1 {
    |  _________-__________^
@@ -110,7 +110,7 @@ LL | |     };
    = help: consider adding an `else` block that evaluates to the expected type
 
 error[E0317]: if may be missing an else clause
-  --> $DIR/if-without-else-as-fn-expr.rs:39:5
+  --> $DIR/if-without-else-as-fn-expr.rs:42:5
    |
 LL |   fn foo3_let(bar: usize) -> usize {
    |                              ----- expected `usize` because of this return type

Diff for: src/test/ui/issues/issue-50577.rs

@@ -2,5 +2,6 @@ fn main() {
     enum Foo {
         Drop = assert_eq!(1, 1)
         //~^ ERROR if may be missing an else clause
+        //~| ERROR mismatched types [E0308]
     }
 }