Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 48 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-27042.stderr b/tests/ui/issues/issue-27042.stderr
new file mode 100644
index 000000000..59ef28481
--- /dev/null
+++ b/tests/ui/issues/issue-27042.stderr
@@ -0,0 +1,48 @@
+warning: denote infinite loops with `loop { ... }`
+  --> $DIR/issue-27042.rs:8:9
+   |
+LL | /         'b:
+LL | |
+LL | |         while true { break }; // but here we cite the whole loop
+   | |__________________^ help: use `loop`
+   |
+   = note: `#[warn(while_true)]` on by default
+
+error[E0308]: mismatched types
+  --> $DIR/issue-27042.rs:6:16
+   |
+LL |         loop { break };
+   |                ^^^^^
+   |                |
+   |                expected `i32`, found `()`
+   |                help: give it a value of the expected type: `break 42`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-27042.rs:8:9
+   |
+LL |       let _: i32 =
+   |              --- expected due to this
+LL | /         'b:
+LL | |
+LL | |         while true { break }; // but here we cite the whole loop
+   | |____________________________^ expected `i32`, found `()`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-27042.rs:12:9
+   |
+LL | /         'c:
+LL | |         for _ in None { break }; // but here we cite the whole loop
+   | |_______________________________^ expected `i32`, found `()`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-27042.rs:15:9
+   |
+LL |       let _: i32 =
+   |              --- expected due to this
+LL | /         'd:
+LL | |         while let Some(_) = None { break };
+   | |__________________________________________^ expected `i32`, found `()`
+
+error: aborting due to 4 previous errors; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0308`.