Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/ui/reachable/expr_if.stderr b/tests/ui/reachable/expr_if.stderr
new file mode 100644
index 000000000..ebd0b5a3e
--- /dev/null
+++ b/tests/ui/reachable/expr_if.stderr
@@ -0,0 +1,30 @@
+error: unreachable block in `if` or `while` expression
+  --> $DIR/expr_if.rs:7:17
+   |
+LL |       if {return} {
+   |  _________------__^
+   | |         |
+   | |         any code following this expression is unreachable
+LL | |         println!("Hello, world!");
+LL | |     }
+   | |_____^ unreachable block in `if` or `while` expression
+   |
+note: the lint level is defined here
+  --> $DIR/expr_if.rs:4:9
+   |
+LL | #![deny(unreachable_code)]
+   |         ^^^^^^^^^^^^^^^^
+
+error: unreachable statement
+  --> $DIR/expr_if.rs:27:5
+   |
+LL |         return;
+   |         ------ any code following this expression is unreachable
+...
+LL |     println!("But I am.");
+   |     ^^^^^^^^^^^^^^^^^^^^^ unreachable statement
+   |
+   = note: this error originates in the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 2 previous errors
+