Rollup merge of #156547 - danieljofficial:move-tests-closures, r=adwinwhite

JonathanBrouwer · web-flow · commit 9283c8e59ba6 · 2026-05-19T15:04:43.000+02:00
Move tests closures Hi, I have moved a few closures related tests. Please review them when you can find the time. This is a part of [133895](#133895)
diff --git a/tests/ui/closures/boxed-closure-captures-fnmut-with-ref.rs b/tests/ui/closures/boxed-closure-captures-fnmut-with-ref.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/18188
+
 //@ check-pass
 
 pub trait Promisable: Send + Sync {}
diff --git a/tests/ui/closures/boxed-closure-sent-through-thread.rs b/tests/ui/closures/boxed-closure-sent-through-thread.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/3609
+
 //@ check-pass
 #![allow(unused_must_use)]
 #![allow(dead_code)]
diff --git a/tests/ui/closures/boxed-closure-with-borrowed-param.rs b/tests/ui/closures/boxed-closure-with-borrowed-param.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/3424
+
 //@ check-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
diff --git a/tests/ui/closures/call-boxed-closure-no-args.rs b/tests/ui/closures/call-boxed-closure-no-args.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/20575
+
 //@ run-pass
 // Test that overloaded calls work with zero arity closures
 
diff --git a/tests/ui/closures/call-closure-through-lifetime-generic-struct.rs b/tests/ui/closures/call-closure-through-lifetime-generic-struct.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/17816
+
 //@ run-pass
 #![allow(unused_variables)]
 use std::marker::PhantomData;
diff --git a/tests/ui/closures/call-fnmut-trait-object-via-ref-mut.rs b/tests/ui/closures/call-fnmut-trait-object-via-ref-mut.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/32389
+
 //@ run-pass
 fn foo<T>() -> T { loop {} }
 
diff --git a/tests/ui/closures/closure-kind-caching-during-upvar-inference.rs b/tests/ui/closures/closure-kind-caching-during-upvar-inference.rs
@@ -1,3 +1,5 @@
+//! Issue: https://github.com/rust-lang/rust/issues/34349
+
 // This is a regression test for a problem encountered around upvar
 // inference and trait caching: in particular, we were entering a
 // temporary closure kind during inference, and then caching results
diff --git a/tests/ui/closures/closure-kind-caching-during-upvar-inference.stderr b/tests/ui/closures/closure-kind-caching-during-upvar-inference.stderr
@@ -1,5 +1,5 @@
 error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnMut`
-  --> $DIR/issue-34349.rs:16:17
+  --> $DIR/closure-kind-caching-during-upvar-inference.rs:18:17
    |
 LL |     let diary = || {
    |                 ^^ this closure implements `FnMut`, not `Fn`
@@ -12,7 +12,7 @@ LL |     apply(diary);
    |     required by a bound introduced by this call
    |
 note: required by a bound in `apply`
-  --> $DIR/issue-34349.rs:11:32
+  --> $DIR/closure-kind-caching-during-upvar-inference.rs:13:32
    |
 LL |     fn apply<F>(f: F) where F: Fn() {
    |                                ^^^^ required by this bound in `apply`
diff --git a/tests/ui/closures/closure-to-fn-pointer-lifetime-error.rs b/tests/ui/closures/closure-to-fn-pointer-lifetime-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/40000
+
 fn main() {
     let bar: fn(&mut u32) = |_| {};
 
diff --git a/tests/ui/closures/closure-to-fn-pointer-lifetime-error.stderr b/tests/ui/closures/closure-to-fn-pointer-lifetime-error.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-40000.rs:6:9
+  --> $DIR/closure-to-fn-pointer-lifetime-error.rs:8:9
    |
 LL |     foo(bar);
    |         ^^^ one type is more general than the other
@@ -8,7 +8,7 @@ LL |     foo(bar);
               found trait object `dyn Fn(&i32)`
 
 error[E0308]: mismatched types
-  --> $DIR/issue-40000.rs:6:9
+  --> $DIR/closure-to-fn-pointer-lifetime-error.rs:8:9
    |
 LL |     foo(bar);
    |         ^^^ one type is more general than the other
diff --git a/tests/ui/closures/closure-with-fixed-size-array-param.rs b/tests/ui/closures/closure-with-fixed-size-array-param.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/28181
+
 //@ run-pass
 fn bar<F>(f: F) -> usize where F: Fn([usize; 1]) -> usize { f([2]) }
 
diff --git a/tests/ui/closures/debug-info-for-closure-capture.rs b/tests/ui/closures/debug-info-for-closure-capture.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/26484
+
 //@ run-pass
 //@ compile-flags:-g
 
diff --git a/tests/ui/closures/destructure-newtype-closure.rs b/tests/ui/closures/destructure-newtype-closure.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/20174
+
 //@ run-pass
 struct GradFn<F: Fn() -> usize>(F);
 
diff --git a/tests/ui/closures/drop-glue-for-closure-with-captures.rs b/tests/ui/closures/drop-glue-for-closure-with-captures.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/36260
+
 //@ run-pass
 // Make sure this compiles without getting a linker error because of missing
 // drop-glue because the collector missed adding drop-glue for the closure:
diff --git a/tests/ui/closures/explicit-return-in-closure-and-outer-fn.rs b/tests/ui/closures/explicit-return-in-closure-and-outer-fn.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/22346
+
 //@ run-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/closures/fn-sugar-in-boxed-trait-object.rs b/tests/ui/closures/fn-sugar-in-boxed-trait-object.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/17897
+
 //@ run-pass
 fn action(mut cb: Box<dyn FnMut(usize) -> usize>) -> usize {
     cb(1)
diff --git a/tests/ui/closures/hrtb-closure-in-recursive-enum-type-error.rs b/tests/ui/closures/hrtb-closure-in-recursive-enum-type-error.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/23046
+
 pub enum Expr<'var, VAR> {
     Let(Box<Expr<'var, VAR>>,
         Box<dyn for<'v> Fn(Expr<'v, VAR>) -> Expr<'v, VAR> + 'var>)
diff --git a/tests/ui/closures/hrtb-closure-in-recursive-enum-type-error.stderr b/tests/ui/closures/hrtb-closure-in-recursive-enum-type-error.stderr
@@ -1,5 +1,5 @@
 error[E0282]: type annotations needed for `Expr<'_, _>`
-  --> $DIR/issue-23046.rs:17:15
+  --> $DIR/hrtb-closure-in-recursive-enum-type-error.rs:19:15
    |
 LL |     let ex = |x| {
    |               ^
diff --git a/tests/ui/closures/module-path-not-confused-with-upvar.rs b/tests/ui/closures/module-path-not-confused-with-upvar.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/29522
+
 //@ run-pass
 #![allow(unused_variables)]
 // check that we don't accidentally capture upvars just because their name
diff --git a/tests/ui/closures/move-closure-can-call-captured-fnmut.rs b/tests/ui/closures/move-closure-can-call-captured-fnmut.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/16668
+
 //@ check-pass
 #![allow(dead_code)]
 struct Parser<'a, I, O> {
diff --git a/tests/ui/closures/move-closure-is-send.rs b/tests/ui/closures/move-closure-is-send.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/16560
+
 //@ run-pass
 #![allow(unused_variables)]
 //@ needs-threads
diff --git a/tests/ui/closures/no-unused-mut-warning-for-move-closure.rs b/tests/ui/closures/no-unused-mut-warning-for-move-closure.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/16671
+
 //@ run-pass
 
 #![deny(warnings)]
diff --git a/tests/ui/closures/pass-lifetime-fn-to-generic-fnonce.rs b/tests/ui/closures/pass-lifetime-fn-to-generic-fnonce.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/19127
+
 //@ run-pass
 #![allow(unused_variables)]
 
diff --git a/tests/ui/closures/ref-binding-lifetime-in-closure-pattern.rs b/tests/ui/closures/ref-binding-lifetime-in-closure-pattern.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/16994
+
 //@ check-pass
 
 fn cb<'a,T>(_x: Box<dyn Fn((&'a i32, &'a (Vec<&'static i32>, bool))) -> T>) -> T {
diff --git a/tests/ui/closures/region-obligations-closure-and-projection.rs b/tests/ui/closures/region-obligations-closure-and-projection.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/46069
+
 //@ run-pass
 use std::iter::{Fuse, Cloned};
 use std::slice::Iter;
diff --git a/tests/ui/closures/unique-closure-type-mismatch.rs b/tests/ui/closures/unique-closure-type-mismatch.rs
@@ -1,3 +1,5 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/24036
+
 fn closure_to_loc() {
     let mut x = |c| c + 1;
     x = |c| c + 1;
diff --git a/tests/ui/closures/unique-closure-type-mismatch.stderr b/tests/ui/closures/unique-closure-type-mismatch.stderr
@@ -1,18 +1,18 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-24036.rs:3:9
+  --> $DIR/unique-closure-type-mismatch.rs:5:9
    |
 LL |     let mut x = |c| c + 1;
    |                 --- the expected closure
 LL |     x = |c| c + 1;
    |         ^^^^^^^^^ expected closure, found a different closure
    |
-   = note: expected closure `{closure@$DIR/issue-24036.rs:2:17: 2:20}`
-              found closure `{closure@$DIR/issue-24036.rs:3:9: 3:12}`
+   = note: expected closure `{closure@$DIR/unique-closure-type-mismatch.rs:4:17: 4:20}`
+              found closure `{closure@$DIR/unique-closure-type-mismatch.rs:5:9: 5:12}`
    = note: no two closures, even if identical, have the same type
    = help: consider boxing your closure and/or using it as a trait object
 
 error[E0284]: type annotations needed
-  --> $DIR/issue-24036.rs:9:15
+  --> $DIR/unique-closure-type-mismatch.rs:11:15
    |
 LL |         1 => |c| c + 1,
    |               ^    - type must be known at this point

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Regression test for https://github.com/rust-lang/rust/issues/18188`
	`2`	`+`
`1`	`3`	`//@ check-pass`
`2`	`4`
`3`	`5`	`pub trait Promisable: Send + Sync {}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Regression test for https://github.com/rust-lang/rust/issues/20575`
	`2`	`+`
`1`	`3`	`//@ run-pass`
`2`	`4`	`// Test that overloaded calls work with zero arity closures`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Issue: https://github.com/rust-lang/rust/issues/34349`
	`2`	`+`
`1`	`3`	`// This is a regression test for a problem encountered around upvar`
`2`	`4`	`// inference and trait caching: in particular, we were entering a`
`3`	`5`	`// temporary closure kind during inference, and then caching results`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnMut`
`2`		`- --> $DIR/issue-34349.rs:16:17`
	`2`	`+ --> $DIR/closure-kind-caching-during-upvar-inference.rs:18:17`
`3`	`3`	`\|`
`4`	`4`	`LL \| let diary = \|\| {`
`5`	`5`	\| ^^ this closure implements `FnMut`, not `Fn`
`@@ -12,7 +12,7 @@ LL \| apply(diary);`
`12`	`12`	`\| required by a bound introduced by this call`
`13`	`13`	`\|`
`14`	`14`	note: required by a bound in `apply`
`15`		`- --> $DIR/issue-34349.rs:11:32`
	`15`	`+ --> $DIR/closure-kind-caching-during-upvar-inference.rs:13:32`
`16`	`16`	`\|`
`17`	`17`	`LL \| fn apply<F>(f: F) where F: Fn() {`
`18`	`18`	\| ^^^^ required by this bound in `apply`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Regression test for https://github.com/rust-lang/rust/issues/40000`
	`2`	`+`
`1`	`3`	`fn main() {`
`2`	`4`	`let bar: fn(&mut u32) = \|_\| {};`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0308]: mismatched types`
`2`		`- --> $DIR/issue-40000.rs:6:9`
	`2`	`+ --> $DIR/closure-to-fn-pointer-lifetime-error.rs:8:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| foo(bar);`
`5`	`5`	`\| ^^^ one type is more general than the other`
`@@ -8,7 +8,7 @@ LL \| foo(bar);`
`8`	`8`	found trait object `dyn Fn(&i32)`
`9`	`9`
`10`	`10`	`error[E0308]: mismatched types`
`11`		`- --> $DIR/issue-40000.rs:6:9`
	`11`	`+ --> $DIR/closure-to-fn-pointer-lifetime-error.rs:8:9`
`12`	`12`	`\|`
`13`	`13`	`LL \| foo(bar);`
`14`	`14`	`\| ^^^ one type is more general than the other`