From a25ec1a018391e2bf1e204bb5c2921a0b42f52f8 Mon Sep 17 00:00:00 2001
From: zedddie <zedddie@protonmail.com>
Date: Mon, 25 May 2026 16:16:38 +0200
Subject: [PATCH 1/2] move batch

---
 .../issue-16922-rpass.rs => coercion/fn-item-to-dyn-any.rs}       | 0
 .../auxiliary/dyn-trait-lifetime-infer-metadata.rs}               | 0
 .../dyn-trait-lifetime-infer-metadata.rs}                         | 0
 .../deprecated-unstable-method-in-staged-api.rs}                  | 0
 .../deprecated-unstable-method-in-staged-api.stderr}              | 0
 .../issue-17216.rs => drop/drop-in-for-loop-destructure.rs}       | 0
 .../need_type_info/unconstrained-type-in-closure.rs}              | 0
 .../need_type_info/unconstrained-type-in-closure.stderr}          | 0
 .../relate-bound-region-in-method-return.rs}                      | 0
 .../tuple-variant-as-struct-variant.rs}                           | 0
 .../tuple-variant-as-struct-variant.stderr}                       | 0
 .../thread-local-borrow-past-function-end.rs}                     | 0
 .../thread-local-borrow-past-function-end.stderr}                 | 0
 .../where-clause-on-struct-definitions.rs}                        | 0
 .../where-clause-on-unit-struct.rs}                               | 0
 .../where-clause-on-unit-struct.stderr}                           | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/ui/{issues/issue-16922-rpass.rs => coercion/fn-item-to-dyn-any.rs} (100%)
 rename tests/ui/{issues/auxiliary/issue-17662.rs => cross-crate/auxiliary/dyn-trait-lifetime-infer-metadata.rs} (100%)
 rename tests/ui/{issues/issue-17662.rs => cross-crate/dyn-trait-lifetime-infer-metadata.rs} (100%)
 rename tests/ui/{issues/issue-17337.rs => deprecation/deprecated-unstable-method-in-staged-api.rs} (100%)
 rename tests/ui/{issues/issue-17337.stderr => deprecation/deprecated-unstable-method-in-staged-api.stderr} (100%)
 rename tests/ui/{issues/issue-17216.rs => drop/drop-in-for-loop-destructure.rs} (100%)
 rename tests/ui/{issues/issue-17551.rs => inference/need_type_info/unconstrained-type-in-closure.rs} (100%)
 rename tests/ui/{issues/issue-17551.stderr => inference/need_type_info/unconstrained-type-in-closure.stderr} (100%)
 rename tests/ui/{issues/issue-17121.rs => regions/relate-bound-region-in-method-return.rs} (100%)
 rename tests/ui/{issues/issue-17800.rs => structs-enums/tuple-variant-as-struct-variant.rs} (100%)
 rename tests/ui/{issues/issue-17800.stderr => structs-enums/tuple-variant-as-struct-variant.stderr} (100%)
 rename tests/ui/{issues/issue-17954.rs => thread-local/thread-local-borrow-past-function-end.rs} (100%)
 rename tests/ui/{issues/issue-17954.stderr => thread-local/thread-local-borrow-past-function-end.stderr} (100%)
 rename tests/ui/{issues/issue-17904.rs => where-clauses/where-clause-on-struct-definitions.rs} (100%)
 rename tests/ui/{issues/issue-17904-2.rs => where-clauses/where-clause-on-unit-struct.rs} (100%)
 rename tests/ui/{issues/issue-17904-2.stderr => where-clauses/where-clause-on-unit-struct.stderr} (100%)

diff --git a/tests/ui/issues/issue-16922-rpass.rs b/tests/ui/coercion/fn-item-to-dyn-any.rs
similarity index 100%
rename from tests/ui/issues/issue-16922-rpass.rs
rename to tests/ui/coercion/fn-item-to-dyn-any.rs
diff --git a/tests/ui/issues/auxiliary/issue-17662.rs b/tests/ui/cross-crate/auxiliary/dyn-trait-lifetime-infer-metadata.rs
similarity index 100%
rename from tests/ui/issues/auxiliary/issue-17662.rs
rename to tests/ui/cross-crate/auxiliary/dyn-trait-lifetime-infer-metadata.rs
diff --git a/tests/ui/issues/issue-17662.rs b/tests/ui/cross-crate/dyn-trait-lifetime-infer-metadata.rs
similarity index 100%
rename from tests/ui/issues/issue-17662.rs
rename to tests/ui/cross-crate/dyn-trait-lifetime-infer-metadata.rs
diff --git a/tests/ui/issues/issue-17337.rs b/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.rs
similarity index 100%
rename from tests/ui/issues/issue-17337.rs
rename to tests/ui/deprecation/deprecated-unstable-method-in-staged-api.rs
diff --git a/tests/ui/issues/issue-17337.stderr b/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.stderr
similarity index 100%
rename from tests/ui/issues/issue-17337.stderr
rename to tests/ui/deprecation/deprecated-unstable-method-in-staged-api.stderr
diff --git a/tests/ui/issues/issue-17216.rs b/tests/ui/drop/drop-in-for-loop-destructure.rs
similarity index 100%
rename from tests/ui/issues/issue-17216.rs
rename to tests/ui/drop/drop-in-for-loop-destructure.rs
diff --git a/tests/ui/issues/issue-17551.rs b/tests/ui/inference/need_type_info/unconstrained-type-in-closure.rs
similarity index 100%
rename from tests/ui/issues/issue-17551.rs
rename to tests/ui/inference/need_type_info/unconstrained-type-in-closure.rs
diff --git a/tests/ui/issues/issue-17551.stderr b/tests/ui/inference/need_type_info/unconstrained-type-in-closure.stderr
similarity index 100%
rename from tests/ui/issues/issue-17551.stderr
rename to tests/ui/inference/need_type_info/unconstrained-type-in-closure.stderr
diff --git a/tests/ui/issues/issue-17121.rs b/tests/ui/regions/relate-bound-region-in-method-return.rs
similarity index 100%
rename from tests/ui/issues/issue-17121.rs
rename to tests/ui/regions/relate-bound-region-in-method-return.rs
diff --git a/tests/ui/issues/issue-17800.rs b/tests/ui/structs-enums/tuple-variant-as-struct-variant.rs
similarity index 100%
rename from tests/ui/issues/issue-17800.rs
rename to tests/ui/structs-enums/tuple-variant-as-struct-variant.rs
diff --git a/tests/ui/issues/issue-17800.stderr b/tests/ui/structs-enums/tuple-variant-as-struct-variant.stderr
similarity index 100%
rename from tests/ui/issues/issue-17800.stderr
rename to tests/ui/structs-enums/tuple-variant-as-struct-variant.stderr
diff --git a/tests/ui/issues/issue-17954.rs b/tests/ui/thread-local/thread-local-borrow-past-function-end.rs
similarity index 100%
rename from tests/ui/issues/issue-17954.rs
rename to tests/ui/thread-local/thread-local-borrow-past-function-end.rs
diff --git a/tests/ui/issues/issue-17954.stderr b/tests/ui/thread-local/thread-local-borrow-past-function-end.stderr
similarity index 100%
rename from tests/ui/issues/issue-17954.stderr
rename to tests/ui/thread-local/thread-local-borrow-past-function-end.stderr
diff --git a/tests/ui/issues/issue-17904.rs b/tests/ui/where-clauses/where-clause-on-struct-definitions.rs
similarity index 100%
rename from tests/ui/issues/issue-17904.rs
rename to tests/ui/where-clauses/where-clause-on-struct-definitions.rs
diff --git a/tests/ui/issues/issue-17904-2.rs b/tests/ui/where-clauses/where-clause-on-unit-struct.rs
similarity index 100%
rename from tests/ui/issues/issue-17904-2.rs
rename to tests/ui/where-clauses/where-clause-on-unit-struct.rs
diff --git a/tests/ui/issues/issue-17904-2.stderr b/tests/ui/where-clauses/where-clause-on-unit-struct.stderr
similarity index 100%
rename from tests/ui/issues/issue-17904-2.stderr
rename to tests/ui/where-clauses/where-clause-on-unit-struct.stderr

From 480b44c8e1b9f4eb0885430bbc7a4ac89ff2b3f6 Mon Sep 17 00:00:00 2001
From: zedddie <zedddie@protonmail.com>
Date: Mon, 25 May 2026 17:48:48 +0200
Subject: [PATCH 2/2] bless batch

---
 tests/ui/coercion/fn-item-to-dyn-any.rs                     | 1 +
 .../auxiliary/dyn-trait-lifetime-infer-metadata.rs          | 1 +
 tests/ui/cross-crate/dyn-trait-lifetime-infer-metadata.rs   | 6 +++---
 .../deprecation/deprecated-unstable-method-in-staged-api.rs | 1 +
 .../deprecated-unstable-method-in-staged-api.stderr         | 4 ++--
 tests/ui/drop/drop-in-for-loop-destructure.rs               | 1 +
 .../need_type_info/unconstrained-type-in-closure.rs         | 2 ++
 .../need_type_info/unconstrained-type-in-closure.stderr     | 2 +-
 tests/ui/regions/relate-bound-region-in-method-return.rs    | 1 +
 tests/ui/structs-enums/tuple-variant-as-struct-variant.rs   | 2 ++
 .../ui/structs-enums/tuple-variant-as-struct-variant.stderr | 2 +-
 .../thread-local/thread-local-borrow-past-function-end.rs   | 1 +
 .../thread-local-borrow-past-function-end.stderr            | 2 +-
 .../ui/where-clauses/where-clause-on-struct-definitions.rs  | 1 +
 tests/ui/where-clauses/where-clause-on-unit-struct.rs       | 1 +
 tests/ui/where-clauses/where-clause-on-unit-struct.stderr   | 2 +-
 16 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/tests/ui/coercion/fn-item-to-dyn-any.rs b/tests/ui/coercion/fn-item-to-dyn-any.rs
index f7ffcfb1d94e3..0e6e5aa5f89ce 100644
--- a/tests/ui/coercion/fn-item-to-dyn-any.rs
+++ b/tests/ui/coercion/fn-item-to-dyn-any.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/16922>.
 //@ run-pass
 
 use std::any::Any;
diff --git a/tests/ui/cross-crate/auxiliary/dyn-trait-lifetime-infer-metadata.rs b/tests/ui/cross-crate/auxiliary/dyn-trait-lifetime-infer-metadata.rs
index 5ecec31deb018..b2265886cb243 100644
--- a/tests/ui/cross-crate/auxiliary/dyn-trait-lifetime-infer-metadata.rs
+++ b/tests/ui/cross-crate/auxiliary/dyn-trait-lifetime-infer-metadata.rs
@@ -1,3 +1,4 @@
+//! Auxiliary crate for <https://github.com/rust-lang/rust/issues/17662>.
 #![crate_type = "lib"]
 
 pub trait Foo<'a, T> {
diff --git a/tests/ui/cross-crate/dyn-trait-lifetime-infer-metadata.rs b/tests/ui/cross-crate/dyn-trait-lifetime-infer-metadata.rs
index e75613e04d333..aacc91f5f6f99 100644
--- a/tests/ui/cross-crate/dyn-trait-lifetime-infer-metadata.rs
+++ b/tests/ui/cross-crate/dyn-trait-lifetime-infer-metadata.rs
@@ -1,8 +1,8 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17662>.
 //@ run-pass
-//@ aux-build:issue-17662.rs
+//@ aux-build:dyn-trait-lifetime-infer-metadata.rs
 
-
-extern crate issue_17662 as i;
+extern crate dyn_trait_lifetime_infer_metadata as i;
 
 use std::marker;
 
diff --git a/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.rs b/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.rs
index 193f89f837897..a4142ff701aec 100644
--- a/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.rs
+++ b/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17337>.
 #![feature(staged_api)]
 #![deny(deprecated)]
 
diff --git a/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.stderr b/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.stderr
index 8fbf6882699de..6c21b45dfd3cc 100644
--- a/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.stderr
+++ b/tests/ui/deprecation/deprecated-unstable-method-in-staged-api.stderr
@@ -1,11 +1,11 @@
 error: use of deprecated method `Foo::foo`: text
-  --> $DIR/issue-17337.rs:16:6
+  --> $DIR/deprecated-unstable-method-in-staged-api.rs:17:6
    |
 LL |     .foo();
    |      ^^^
    |
 note: the lint level is defined here
-  --> $DIR/issue-17337.rs:2:9
+  --> $DIR/deprecated-unstable-method-in-staged-api.rs:3:9
    |
 LL | #![deny(deprecated)]
    |         ^^^^^^^^^^
diff --git a/tests/ui/drop/drop-in-for-loop-destructure.rs b/tests/ui/drop/drop-in-for-loop-destructure.rs
index 31b16ef3a2f7b..2c277777eaf6a 100644
--- a/tests/ui/drop/drop-in-for-loop-destructure.rs
+++ b/tests/ui/drop/drop-in-for-loop-destructure.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17216>.
 //@ run-pass
 #![allow(unused_variables)]
 struct Leak<'a> {
diff --git a/tests/ui/inference/need_type_info/unconstrained-type-in-closure.rs b/tests/ui/inference/need_type_info/unconstrained-type-in-closure.rs
index a65957ce074ef..3b6c20fe5bfbb 100644
--- a/tests/ui/inference/need_type_info/unconstrained-type-in-closure.rs
+++ b/tests/ui/inference/need_type_info/unconstrained-type-in-closure.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17551>.
+
 use std::marker;
 
 struct B<T>(marker::PhantomData<T>);
diff --git a/tests/ui/inference/need_type_info/unconstrained-type-in-closure.stderr b/tests/ui/inference/need_type_info/unconstrained-type-in-closure.stderr
index b9cb76fc298d9..18c7f669fae7d 100644
--- a/tests/ui/inference/need_type_info/unconstrained-type-in-closure.stderr
+++ b/tests/ui/inference/need_type_info/unconstrained-type-in-closure.stderr
@@ -1,5 +1,5 @@
 error[E0282]: type annotations needed for `B<_>`
-  --> $DIR/issue-17551.rs:6:9
+  --> $DIR/unconstrained-type-in-closure.rs:8:9
    |
 LL |     let foo = B(marker::PhantomData);
    |         ^^^     ------------------- type must be known at this point
diff --git a/tests/ui/regions/relate-bound-region-in-method-return.rs b/tests/ui/regions/relate-bound-region-in-method-return.rs
index 6bb89a4aa7b43..a994f7f1af0cb 100644
--- a/tests/ui/regions/relate-bound-region-in-method-return.rs
+++ b/tests/ui/regions/relate-bound-region-in-method-return.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17121>.
 //@ check-pass
 #![allow(dead_code)]
 
diff --git a/tests/ui/structs-enums/tuple-variant-as-struct-variant.rs b/tests/ui/structs-enums/tuple-variant-as-struct-variant.rs
index 5254f45d7c2de..53da4622013ba 100644
--- a/tests/ui/structs-enums/tuple-variant-as-struct-variant.rs
+++ b/tests/ui/structs-enums/tuple-variant-as-struct-variant.rs
@@ -1,3 +1,5 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17800>.
+
 enum MyOption<T> {
     MySome(T),
     MyNone,
diff --git a/tests/ui/structs-enums/tuple-variant-as-struct-variant.stderr b/tests/ui/structs-enums/tuple-variant-as-struct-variant.stderr
index 322c77eaa1dc5..1170e3b7bfd8a 100644
--- a/tests/ui/structs-enums/tuple-variant-as-struct-variant.stderr
+++ b/tests/ui/structs-enums/tuple-variant-as-struct-variant.stderr
@@ -1,5 +1,5 @@
 error[E0769]: tuple variant `MyOption::MySome` written as struct variant
-  --> $DIR/issue-17800.rs:8:9
+  --> $DIR/tuple-variant-as-struct-variant.rs:10:9
    |
 LL |         MyOption::MySome { x: 42 } => (),
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/thread-local/thread-local-borrow-past-function-end.rs b/tests/ui/thread-local/thread-local-borrow-past-function-end.rs
index eb6a3d70f58e2..12938f0a0a2d4 100644
--- a/tests/ui/thread-local/thread-local-borrow-past-function-end.rs
+++ b/tests/ui/thread-local/thread-local-borrow-past-function-end.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17954>.
 #![feature(thread_local)]
 
 #[thread_local]
diff --git a/tests/ui/thread-local/thread-local-borrow-past-function-end.stderr b/tests/ui/thread-local/thread-local-borrow-past-function-end.stderr
index 0dddea8336483..7686a6b714764 100644
--- a/tests/ui/thread-local/thread-local-borrow-past-function-end.stderr
+++ b/tests/ui/thread-local/thread-local-borrow-past-function-end.stderr
@@ -1,5 +1,5 @@
 error[E0712]: thread-local variable borrowed past end of function
-  --> $DIR/issue-17954.rs:7:13
+  --> $DIR/thread-local-borrow-past-function-end.rs:8:13
    |
 LL |     let a = &FOO;
    |             ^^^^ thread-local variables cannot be borrowed beyond the end of the function
diff --git a/tests/ui/where-clauses/where-clause-on-struct-definitions.rs b/tests/ui/where-clauses/where-clause-on-struct-definitions.rs
index fba71f70dd98e..a49df546ac31b 100644
--- a/tests/ui/where-clauses/where-clause-on-struct-definitions.rs
+++ b/tests/ui/where-clauses/where-clause-on-struct-definitions.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17904>.
 //@ check-pass
 #![allow(dead_code)]
 // Test that we can parse where clauses on various forms of tuple
diff --git a/tests/ui/where-clauses/where-clause-on-unit-struct.rs b/tests/ui/where-clauses/where-clause-on-unit-struct.rs
index 9603da097b1cf..46fdd3737fa70 100644
--- a/tests/ui/where-clauses/where-clause-on-unit-struct.rs
+++ b/tests/ui/where-clauses/where-clause-on-unit-struct.rs
@@ -1,3 +1,4 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/17904>.
 // Test that we can parse a unit struct with a where clause, even if
 // it leads to an error later on since `T` is unused.
 
diff --git a/tests/ui/where-clauses/where-clause-on-unit-struct.stderr b/tests/ui/where-clauses/where-clause-on-unit-struct.stderr
index 9965106d1401a..174c2d9e22e8d 100644
--- a/tests/ui/where-clauses/where-clause-on-unit-struct.stderr
+++ b/tests/ui/where-clauses/where-clause-on-unit-struct.stderr
@@ -1,5 +1,5 @@
 error[E0392]: type parameter `T` is never used
-  --> $DIR/issue-17904-2.rs:4:12
+  --> $DIR/where-clause-on-unit-struct.rs:5:12
    |
 LL | struct Foo<T> where T: Copy;
    |            ^ unused type parameter