Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/ui/typeck/wrong-ret-type.stderr b/tests/ui/typeck/wrong-ret-type.stderr
new file mode 100644
index 000000000..c686a0b2f
--- /dev/null
+++ b/tests/ui/typeck/wrong-ret-type.stderr
@@ -0,0 +1,16 @@
+error[E0308]: mismatched types
+  --> $DIR/wrong-ret-type.rs:2:49
+   |
+LL | fn mk_int() -> usize { let i: isize = 3; return i; }
+   |                -----                            ^ expected `usize`, found `isize`
+   |                |
+   |                expected `usize` because of return type
+   |
+help: you can convert an `isize` to a `usize` and panic if the converted value doesn't fit
+   |
+LL | fn mk_int() -> usize { let i: isize = 3; return i.try_into().unwrap(); }
+   |                                                  ++++++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.