Adding upstream version 1.64.0+dfsg1.upstream/1.64.0+dfsg1

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

1 files changed, 42 insertions, 0 deletions

diff --git a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
new file mode 100644
index 000000000..82d136bd3
--- /dev/null
+++ b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
@@ -0,0 +1,42 @@
+error[E0308]: mismatched types
+  --> $DIR/liveness-return-last-stmt-semi.rs:7:19
+   |
+LL | fn no_return() -> i32 {}
+   |    ---------      ^^^ expected `i32`, found `()`
+   |    |
+   |    implicitly returns `()` as its body has no tail or `return` expression
+
+error[E0308]: mismatched types
+  --> $DIR/liveness-return-last-stmt-semi.rs:9:19
+   |
+LL | fn bar(x: u32) -> u32 {
+   |    ---            ^^^ expected `u32`, found `()`
+   |    |
+   |    implicitly returns `()` as its body has no tail or `return` expression
+LL |     x * 2;
+   |          - help: remove this semicolon
+
+error[E0308]: mismatched types
+  --> $DIR/liveness-return-last-stmt-semi.rs:13:19
+   |
+LL | fn baz(x: u64) -> u32 {
+   |    ---            ^^^ expected `u32`, found `()`
+   |    |
+   |    implicitly returns `()` as its body has no tail or `return` expression
+
+error[E0308]: mismatched types
+  --> $DIR/liveness-return-last-stmt-semi.rs:4:41
+   |
+LL | macro_rules! test { () => { fn foo() -> i32 { 1; } } }
+   |                                ---      ^^^ expected `i32`, found `()`
+   |                                |
+   |                                implicitly returns `()` as its body has no tail or `return` expression
+...
+LL |     test!();
+   |     ------- in this macro invocation
+   |
+   = note: this error originates in the macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0308`.