Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/ui/block-result/consider-removing-last-semi.fixed b/tests/ui/block-result/consider-removing-last-semi.fixed
new file mode 100644
index 000000000..36a769fe5
--- /dev/null
+++ b/tests/ui/block-result/consider-removing-last-semi.fixed
@@ -0,0 +1,20 @@
+// run-rustfix
+
+pub fn f() -> String {  //~ ERROR mismatched types
+    0u8;
+    "bla".to_string()
+}
+
+pub fn g() -> String {  //~ ERROR mismatched types
+    "this won't work".to_string();
+    "removeme".to_string()
+}
+
+pub fn macro_tests() -> u32 {  //~ ERROR mismatched types
+    macro_rules! mac {
+        () => (1);
+    }
+    mac!()
+}
+
+fn main() {}