Fix consider borrowing for else-if

Author: JonathanBrouwer

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

@@ -2713,6 +2713,36 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         ));
                     }
 
+                    // Don't try to suggest ref/deref on an `if` expression, because:
+                    // - The `if` could be part of a desugared `if else` statement,
+                    //   which would create impossible suggestions such as `if ... { ... } else &if { ... } else { ... }`.
+                    // - In general the suggestions it creates such as `&if ... { ... } else { ... }` are kind of ugly.
+                    // We try to generate a suggestion such as `if ... { &... } else { &... }` instead.
+                    if let hir::ExprKind::If(_c, then, els) = expr.kind {
+                        // If there is no `else`, the return type of this `if` will be (), so suggesting to change the `then` block is useless
+                        let Some(els) = els else {
+                            return None;
+                        };
+                        let (mut then_suggs, help, app, verbose, mutref) =
+                            self.suggest_deref_or_ref(then, checked_ty, expected)?;
+                        let (else_suggs, ..) =
+                            self.suggest_deref_or_ref(els, checked_ty, expected)?;
+                        then_suggs.extend(else_suggs);
+                        return Some((then_suggs, help, app, verbose, mutref));
+                    }
+
+                    // Don't try to suggest ref/deref on a `block` expression, because it is ugly.
+                    // It creates suggestions such as `&{ ... }`.
+                    // Instead suggest `{ ...; &... }` ref/deref on the final expression
+                    if let hir::ExprKind::Block(block, _) = expr.kind {
+                        // If the block expression does not have a final expression the type will be `()`,
+                        // in which case there are no good ref/deref suggestions to be made.
+                        let Some(expr) = block.expr else {
+                            return None;
+                        };
+                        return self.suggest_deref_or_ref(expr, checked_ty, expected);
+                    }
+
                     if let Some((sugg, msg)) = self.can_use_as_ref(expr) {
                         return Some((
                             sugg,

tests/ui/typeck/consider-borrowing-141810-1.rs

@@ -0,0 +1,9 @@
+fn main() {
+    let x = if true {
+        &true
+    } else if false { //~ ERROR `if` and `else` have incompatible types [E0308]
+        true //~ HELP consider borrowing here
+    } else {
+        true
+    };
+}

tests/ui/typeck/consider-borrowing-141810-1.stderr

@@ -0,0 +1,28 @@
+error[E0308]: `if` and `else` have incompatible types
+  --> $DIR/consider-borrowing-141810-1.rs:4:12
+   |
+LL |        let x = if true {
+   |  ______________-
+LL | |          &true
+   | |          ----- expected because of this
+LL | |      } else if false {
+   | | ____________^
+LL | ||         true
+LL | ||     } else {
+LL | ||         true
+LL | ||     };
+   | ||     ^
+   | ||_____|
+   |  |_____`if` and `else` have incompatible types
+   |        expected `&bool`, found `bool`
+   |
+help: consider borrowing here
+   |
+LL ~         &true
+LL |     } else {
+LL ~         &true
+   |
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.

tests/ui/typeck/consider-borrowing-141810-2.rs

@@ -0,0 +1,8 @@
+fn main() {
+    let x = if true {
+        &()
+    } else if false { //~ ERROR `if` and `else` have incompatible types [E0308]
+    } else {
+    };
+
+}

tests/ui/typeck/consider-borrowing-141810-2.stderr

@@ -0,0 +1,19 @@
+error[E0308]: `if` and `else` have incompatible types
+  --> $DIR/consider-borrowing-141810-2.rs:4:12
+   |
+LL |        let x = if true {
+   |  ______________-
+LL | |          &()
+   | |          --- expected because of this
+LL | |      } else if false {
+   | | ____________^
+LL | ||     } else {
+LL | ||     };
+   | ||     ^
+   | ||_____|
+   |  |_____`if` and `else` have incompatible types
+   |        expected `&()`, found `()`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.

tests/ui/typeck/consider-borrowing-141810-3.rs

@@ -0,0 +1,9 @@
+fn main() {
+    expect_ref_bool({
+        true
+        //~^ ERROR mismatched types
+        //~| HELP consider borrowing here
+    })
+}
+
+fn expect_ref_bool(b: &bool) {}

tests/ui/typeck/consider-borrowing-141810-3.stderr

@@ -0,0 +1,14 @@
+error[E0308]: mismatched types
+  --> $DIR/consider-borrowing-141810-3.rs:3:9
+   |
+LL |         true
+   |         ^^^^ expected `&bool`, found `bool`
+   |
+help: consider borrowing here
+   |
+LL |         &true
+   |         +
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.

tests/ui/typeck/consider-borrowing-141810-4.rs

@@ -0,0 +1,11 @@
+fn main() {
+    let x = if true {
+        &true
+    } else if false { //~ ERROR `if` and `else` have incompatible types [E0308]
+        {
+            true //~ HELP consider borrowing here
+        }
+    } else {
+        true
+    };
+}

tests/ui/typeck/consider-borrowing-141810-4.stderr

@@ -0,0 +1,30 @@
+error[E0308]: `if` and `else` have incompatible types
+  --> $DIR/consider-borrowing-141810-4.rs:4:12
+   |
+LL |        let x = if true {
+   |  ______________-
+LL | |          &true
+   | |          ----- expected because of this
+LL | |      } else if false {
+   | | ____________^
+LL | ||         {
+LL | ||             true
+...  ||
+LL | ||         true
+LL | ||     };
+   | ||     ^
+   | ||_____|
+   |  |_____`if` and `else` have incompatible types
+   |        expected `&bool`, found `bool`
+   |
+help: consider borrowing here
+   |
+LL ~             &true
+LL |         }
+LL |     } else {
+LL ~         &true
+   |
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.

tests/ui/typeck/consider-borrowing-141810-5.rs

@@ -0,0 +1,7 @@
+fn main() {
+    let x = if true {
+        &()
+    } else if false { //~ ERROR `if` and `else` have incompatible types [E0308]
+
+    };
+}