Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/ui/unboxed-closures/unboxed-closures-single-word-env.rs b/tests/ui/unboxed-closures/unboxed-closures-single-word-env.rs
new file mode 100644
index 000000000..8ada7494e
--- /dev/null
+++ b/tests/ui/unboxed-closures/unboxed-closures-single-word-env.rs
@@ -0,0 +1,22 @@
+// run-pass
+// Ensures that single-word environments work right in unboxed closures.
+// These take a different path in codegen.
+
+fn a<F:Fn(isize, isize) -> isize>(f: F) -> isize {
+    f(1, 2)
+}
+
+fn b<F:FnMut(isize, isize) -> isize>(mut f: F) -> isize {
+    f(3, 4)
+}
+
+fn c<F:FnOnce(isize, isize) -> isize>(f: F) -> isize {
+    f(5, 6)
+}
+
+fn main() {
+    let z = 10;
+    assert_eq!(a(move |x: isize, y| x + y + z), 13);
+    assert_eq!(b(move |x: isize, y| x + y + z), 17);
+    assert_eq!(c(move |x: isize, y| x + y + z), 21);
+}