Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/ui/ret-bang.rs b/tests/ui/ret-bang.rs
new file mode 100644
index 000000000..6618992e0
--- /dev/null
+++ b/tests/ui/ret-bang.rs
@@ -0,0 +1,13 @@
+// run-pass
+
+fn my_err(s: String) -> ! { println!("{}", s); panic!(); }
+
+fn okay(i: usize) -> isize {
+    if i == 3 {
+        my_err("I don't like three".to_string());
+    } else {
+        return 42;
+    }
+}
+
+pub fn main() { okay(4); }