Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/ui/functions-closures/return-from-closure.rs b/tests/ui/functions-closures/return-from-closure.rs
new file mode 100644
index 000000000..656a95f12
--- /dev/null
+++ b/tests/ui/functions-closures/return-from-closure.rs
@@ -0,0 +1,33 @@
+// run-pass
+#![allow(non_upper_case_globals)]
+// just to make sure that `return` is only returning from the closure,
+// not the surrounding function.
+
+static mut calls: usize = 0;
+
+fn surrounding() {
+    let return_works = |n: isize| {
+        unsafe { calls += 1 }
+
+        if n >= 0 { return; }
+        panic!()
+    };
+
+    return_works(10);
+    return_works(20);
+
+    let return_works_proc = |n: isize| {
+        unsafe { calls += 1 }
+
+        if n >= 0 { return; }
+        panic!()
+    };
+
+    return_works_proc(10);
+}
+
+pub fn main() {
+    surrounding();
+
+    assert_eq!(unsafe {calls}, 3);
+}