Fix incorrect type mismatch label pointing at return type

3 files changed, 34 insertions, 3 deletions

diff --git a/src/test/ui/suggestions/issue-46302.rs b/src/test/ui/suggestions/issue-46302.rs
new file mode 100644
index 00000000000..6ae6b549b07
--- /dev/null
+++ b/src/test/ui/suggestions/issue-46302.rs
@@ -0,0 +1,19 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn foo() {
+  let s = "abc";
+  let u: &str = if true { s[..2] } else { s };
+  //~^ ERROR mismatched types
+}
+
+fn main() {
+    foo();
+}
diff --git a/src/test/ui/suggestions/issue-46302.stderr b/src/test/ui/suggestions/issue-46302.stderr
new file mode 100644
index 00000000000..8e399136fad
--- /dev/null
+++ b/src/test/ui/suggestions/issue-46302.stderr
@@ -0,0 +1,15 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-46302.rs:13:27
+   |
+LL |   let u: &str = if true { s[..2] } else { s };
+   |                           ^^^^^^
+   |                           |
+   |                           expected &str, found str
+   |                           help: consider borrowing here: `&s[..2]`
+   |
+   = note: expected type `&str`
+              found type `str`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/str-array-assignment.stderr b/src/test/ui/suggestions/str-array-assignment.stderr
index 041bae4a421..5af936eec5b 100644
--- a/src/test/ui/suggestions/str-array-assignment.stderr
+++ b/src/test/ui/suggestions/str-array-assignment.stderr
@@ -10,9 +10,6 @@ LL |   let t = if true { s[..2] } else { s };
 error[E0308]: mismatched types
   --> $DIR/str-array-assignment.rs:15:27
    |
-LL | fn main() {
-   |           - expected `()` because of default return type
-...
 LL |   let u: &str = if true { s[..2] } else { s };
    |                           ^^^^^^
    |                           |