Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/ui/block-result/consider-removing-last-semi.stderr b/tests/ui/block-result/consider-removing-last-semi.stderr
new file mode 100644
index 000000000..9be0367ae
--- /dev/null
+++ b/tests/ui/block-result/consider-removing-last-semi.stderr
@@ -0,0 +1,36 @@
+error[E0308]: mismatched types
+  --> $DIR/consider-removing-last-semi.rs:3:15
+   |
+LL | pub fn f() -> String {
+   |        -      ^^^^^^ expected struct `String`, found `()`
+   |        |
+   |        implicitly returns `()` as its body has no tail or `return` expression
+LL |     0u8;
+LL |     "bla".to_string();
+   |                      - help: remove this semicolon to return this value
+
+error[E0308]: mismatched types
+  --> $DIR/consider-removing-last-semi.rs:8:15
+   |
+LL | pub fn g() -> String {
+   |        -      ^^^^^^ expected struct `String`, found `()`
+   |        |
+   |        implicitly returns `()` as its body has no tail or `return` expression
+LL |     "this won't work".to_string();
+LL |     "removeme".to_string();
+   |                           - help: remove this semicolon to return this value
+
+error[E0308]: mismatched types
+  --> $DIR/consider-removing-last-semi.rs:13:25
+   |
+LL | pub fn macro_tests() -> u32 {
+   |        -----------      ^^^ expected `u32`, found `()`
+   |        |
+   |        implicitly returns `()` as its body has no tail or `return` expression
+...
+LL |     mac!();
+   |           - help: remove this semicolon to return this value
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0308`.