From 9016189942ef529c95622d9fad909577a3936386 Mon Sep 17 00:00:00 2001
From: zedddie <zedddie@protonmail.com>
Date: Fri, 3 Jul 2026 23:37:02 +0200
Subject: [PATCH 1/2] move batch

---
 .../unconstrained-lifetime-in-projection.rs}                      | 0
 .../unconstrained-lifetime-in-projection.stderr}                  | 0
 .../index-self-with-arithmetic-on-self-item.rs}                   | 0
 .../issue-2989.rs => codegen/bitvec-to-bools-opt-miscompile.rs}   | 0
 .../bitvec-to-bools-opt-miscompile.stderr}                        | 0
 .../issue-30081.rs => codegen/box-deref-segfault-misopt.rs}       | 0
 .../issue-29948.rs => drop/move-closure-drop-on-unwind.rs}        | 0
 .../issue-30018-panic.rs => drop/panic-during-slice-init.rs}      | 0
 .../issue-29668.rs => privacy/fn-returns-unnameable-type.rs}      | 0
 .../issue-3021-b.rs => resolve/impl-method-cant-capture-env.rs}   | 0
 .../impl-method-cant-capture-env.stderr}                          | 0
 .../{issue-3021.rs => impl-trait-for-type-cant-capture-env.rs}    | 0
 ...ue-3021.stderr => impl-trait-for-type-cant-capture-env.stderr} | 0
 .../resolve/{issue-3021-c.rs => outer-generic-in-trait-method.rs} | 0
 .../{issue-3021-c.stderr => outer-generic-in-trait-method.stderr} | 0
 .../issue-3021-d.rs => resolve/trait-impl-cant-capture-env.rs}    | 0
 .../trait-impl-cant-capture-env.stderr}                           | 0
 17 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/ui/{issues/issue-29861.rs => associated-types/unconstrained-lifetime-in-projection.rs} (100%)
 rename tests/ui/{issues/issue-29861.stderr => associated-types/unconstrained-lifetime-in-projection.stderr} (100%)
 rename tests/ui/{issues/issue-29743.rs => borrowck/index-self-with-arithmetic-on-self-item.rs} (100%)
 rename tests/ui/{issues/issue-2989.rs => codegen/bitvec-to-bools-opt-miscompile.rs} (100%)
 rename tests/ui/{issues/issue-2989.stderr => codegen/bitvec-to-bools-opt-miscompile.stderr} (100%)
 rename tests/ui/{issues/issue-30081.rs => codegen/box-deref-segfault-misopt.rs} (100%)
 rename tests/ui/{issues/issue-29948.rs => drop/move-closure-drop-on-unwind.rs} (100%)
 rename tests/ui/{issues/issue-30018-panic.rs => drop/panic-during-slice-init.rs} (100%)
 rename tests/ui/{issues/issue-29668.rs => privacy/fn-returns-unnameable-type.rs} (100%)
 rename tests/ui/{issues/issue-3021-b.rs => resolve/impl-method-cant-capture-env.rs} (100%)
 rename tests/ui/{issues/issue-3021-b.stderr => resolve/impl-method-cant-capture-env.stderr} (100%)
 rename tests/ui/resolve/{issue-3021.rs => impl-trait-for-type-cant-capture-env.rs} (100%)
 rename tests/ui/resolve/{issue-3021.stderr => impl-trait-for-type-cant-capture-env.stderr} (100%)
 rename tests/ui/resolve/{issue-3021-c.rs => outer-generic-in-trait-method.rs} (100%)
 rename tests/ui/resolve/{issue-3021-c.stderr => outer-generic-in-trait-method.stderr} (100%)
 rename tests/ui/{issues/issue-3021-d.rs => resolve/trait-impl-cant-capture-env.rs} (100%)
 rename tests/ui/{issues/issue-3021-d.stderr => resolve/trait-impl-cant-capture-env.stderr} (100%)

diff --git a/tests/ui/issues/issue-29861.rs b/tests/ui/associated-types/unconstrained-lifetime-in-projection.rs
similarity index 100%
rename from tests/ui/issues/issue-29861.rs
rename to tests/ui/associated-types/unconstrained-lifetime-in-projection.rs
diff --git a/tests/ui/issues/issue-29861.stderr b/tests/ui/associated-types/unconstrained-lifetime-in-projection.stderr
similarity index 100%
rename from tests/ui/issues/issue-29861.stderr
rename to tests/ui/associated-types/unconstrained-lifetime-in-projection.stderr
diff --git a/tests/ui/issues/issue-29743.rs b/tests/ui/borrowck/index-self-with-arithmetic-on-self-item.rs
similarity index 100%
rename from tests/ui/issues/issue-29743.rs
rename to tests/ui/borrowck/index-self-with-arithmetic-on-self-item.rs
diff --git a/tests/ui/issues/issue-2989.rs b/tests/ui/codegen/bitvec-to-bools-opt-miscompile.rs
similarity index 100%
rename from tests/ui/issues/issue-2989.rs
rename to tests/ui/codegen/bitvec-to-bools-opt-miscompile.rs
diff --git a/tests/ui/issues/issue-2989.stderr b/tests/ui/codegen/bitvec-to-bools-opt-miscompile.stderr
similarity index 100%
rename from tests/ui/issues/issue-2989.stderr
rename to tests/ui/codegen/bitvec-to-bools-opt-miscompile.stderr
diff --git a/tests/ui/issues/issue-30081.rs b/tests/ui/codegen/box-deref-segfault-misopt.rs
similarity index 100%
rename from tests/ui/issues/issue-30081.rs
rename to tests/ui/codegen/box-deref-segfault-misopt.rs
diff --git a/tests/ui/issues/issue-29948.rs b/tests/ui/drop/move-closure-drop-on-unwind.rs
similarity index 100%
rename from tests/ui/issues/issue-29948.rs
rename to tests/ui/drop/move-closure-drop-on-unwind.rs
diff --git a/tests/ui/issues/issue-30018-panic.rs b/tests/ui/drop/panic-during-slice-init.rs
similarity index 100%
rename from tests/ui/issues/issue-30018-panic.rs
rename to tests/ui/drop/panic-during-slice-init.rs
diff --git a/tests/ui/issues/issue-29668.rs b/tests/ui/privacy/fn-returns-unnameable-type.rs
similarity index 100%
rename from tests/ui/issues/issue-29668.rs
rename to tests/ui/privacy/fn-returns-unnameable-type.rs
diff --git a/tests/ui/issues/issue-3021-b.rs b/tests/ui/resolve/impl-method-cant-capture-env.rs
similarity index 100%
rename from tests/ui/issues/issue-3021-b.rs
rename to tests/ui/resolve/impl-method-cant-capture-env.rs
diff --git a/tests/ui/issues/issue-3021-b.stderr b/tests/ui/resolve/impl-method-cant-capture-env.stderr
similarity index 100%
rename from tests/ui/issues/issue-3021-b.stderr
rename to tests/ui/resolve/impl-method-cant-capture-env.stderr
diff --git a/tests/ui/resolve/issue-3021.rs b/tests/ui/resolve/impl-trait-for-type-cant-capture-env.rs
similarity index 100%
rename from tests/ui/resolve/issue-3021.rs
rename to tests/ui/resolve/impl-trait-for-type-cant-capture-env.rs
diff --git a/tests/ui/resolve/issue-3021.stderr b/tests/ui/resolve/impl-trait-for-type-cant-capture-env.stderr
similarity index 100%
rename from tests/ui/resolve/issue-3021.stderr
rename to tests/ui/resolve/impl-trait-for-type-cant-capture-env.stderr
diff --git a/tests/ui/resolve/issue-3021-c.rs b/tests/ui/resolve/outer-generic-in-trait-method.rs
similarity index 100%
rename from tests/ui/resolve/issue-3021-c.rs
rename to tests/ui/resolve/outer-generic-in-trait-method.rs
diff --git a/tests/ui/resolve/issue-3021-c.stderr b/tests/ui/resolve/outer-generic-in-trait-method.stderr
similarity index 100%
rename from tests/ui/resolve/issue-3021-c.stderr
rename to tests/ui/resolve/outer-generic-in-trait-method.stderr
diff --git a/tests/ui/issues/issue-3021-d.rs b/tests/ui/resolve/trait-impl-cant-capture-env.rs
similarity index 100%
rename from tests/ui/issues/issue-3021-d.rs
rename to tests/ui/resolve/trait-impl-cant-capture-env.rs
diff --git a/tests/ui/issues/issue-3021-d.stderr b/tests/ui/resolve/trait-impl-cant-capture-env.stderr
similarity index 100%
rename from tests/ui/issues/issue-3021-d.stderr
rename to tests/ui/resolve/trait-impl-cant-capture-env.stderr

From 0c42d9225a4bb7e33289a2cdad69eb7ac9f9b7d5 Mon Sep 17 00:00:00 2001
From: zedddie <zedddie@protonmail.com>
Date: Fri, 3 Jul 2026 23:37:29 +0200
Subject: [PATCH 2/2] bless batch

---
 src/tools/tidy/src/issues.txt                          |  2 --
 .../unconstrained-lifetime-in-projection.rs            |  4 ++++
 .../unconstrained-lifetime-in-projection.stderr        |  4 ++--
 .../index-self-with-arithmetic-on-self-item.rs         |  3 +++
 tests/ui/codegen/bitvec-to-bools-opt-miscompile.rs     |  2 ++
 tests/ui/codegen/bitvec-to-bools-opt-miscompile.stderr |  2 +-
 tests/ui/codegen/box-deref-segfault-misopt.rs          |  3 ++-
 tests/ui/drop/move-closure-drop-on-unwind.rs           |  4 ++++
 tests/ui/drop/panic-during-slice-init.rs               | 10 +++++-----
 tests/ui/privacy/fn-returns-unnameable-type.rs         |  3 ++-
 tests/ui/resolve/impl-method-cant-capture-env.rs       |  3 +++
 tests/ui/resolve/impl-method-cant-capture-env.stderr   |  2 +-
 .../ui/resolve/impl-trait-for-type-cant-capture-env.rs |  3 +++
 .../impl-trait-for-type-cant-capture-env.stderr        |  2 +-
 tests/ui/resolve/outer-generic-in-trait-method.rs      |  3 +++
 tests/ui/resolve/outer-generic-in-trait-method.stderr  |  4 ++--
 tests/ui/resolve/trait-impl-cant-capture-env.rs        |  3 +++
 tests/ui/resolve/trait-impl-cant-capture-env.stderr    |  4 ++--
 18 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index db6008da59b34..bb251a6823ac6 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -2324,8 +2324,6 @@ ui/resolve/issue-2356.rs
 ui/resolve/issue-23716.rs
 ui/resolve/issue-24968.rs
 ui/resolve/issue-26545.rs
-ui/resolve/issue-3021-c.rs
-ui/resolve/issue-3021.rs
 ui/resolve/issue-30535.rs
 ui/resolve/issue-3099-a.rs
 ui/resolve/issue-3099-b.rs
diff --git a/tests/ui/associated-types/unconstrained-lifetime-in-projection.rs b/tests/ui/associated-types/unconstrained-lifetime-in-projection.rs
index 875c168185feb..bee7d521c30f8 100644
--- a/tests/ui/associated-types/unconstrained-lifetime-in-projection.rs
+++ b/tests/ui/associated-types/unconstrained-lifetime-in-projection.rs
@@ -1,3 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/29861>.
+//! Unconstrained lifetimes in associated type were wrongly allowed when
+//! occurred in projection.
+
 pub trait MakeRef<'a> {
     type Ref;
 }
diff --git a/tests/ui/associated-types/unconstrained-lifetime-in-projection.stderr b/tests/ui/associated-types/unconstrained-lifetime-in-projection.stderr
index a25cbf0515d84..0847fa652c55a 100644
--- a/tests/ui/associated-types/unconstrained-lifetime-in-projection.stderr
+++ b/tests/ui/associated-types/unconstrained-lifetime-in-projection.stderr
@@ -1,11 +1,11 @@
 error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates
-  --> $DIR/issue-29861.rs:11:6
+  --> $DIR/unconstrained-lifetime-in-projection.rs:15:6
    |
 LL | impl<'a, T: 'a> MakeRef2 for T {
    |      ^^ unconstrained lifetime parameter
 
 error[E0716]: temporary value dropped while borrowed
-  --> $DIR/issue-29861.rs:16:43
+  --> $DIR/unconstrained-lifetime-in-projection.rs:20:43
    |
 LL | fn foo() -> <String as MakeRef2>::Ref2 { &String::from("foo") }
    |                                           ^^^^^^^^^^^^^^^^^^^ -- borrow later used here
diff --git a/tests/ui/borrowck/index-self-with-arithmetic-on-self-item.rs b/tests/ui/borrowck/index-self-with-arithmetic-on-self-item.rs
index 8e522a7482190..3987e782af27b 100644
--- a/tests/ui/borrowck/index-self-with-arithmetic-on-self-item.rs
+++ b/tests/ui/borrowck/index-self-with-arithmetic-on-self-item.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/29743>.
+//! Test borrowck doesn't complain about using arithmetic with self item
+//! as index.
 //@ check-pass
 
 fn main() {
diff --git a/tests/ui/codegen/bitvec-to-bools-opt-miscompile.rs b/tests/ui/codegen/bitvec-to-bools-opt-miscompile.rs
index fc35d1906368f..9611cd5485b60 100644
--- a/tests/ui/codegen/bitvec-to-bools-opt-miscompile.rs
+++ b/tests/ui/codegen/bitvec-to-bools-opt-miscompile.rs
@@ -1,4 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/2989>.
 //@ run-pass
+
 #![allow(non_camel_case_types)]
 
 trait methods { //~ WARN trait `methods` is never used
diff --git a/tests/ui/codegen/bitvec-to-bools-opt-miscompile.stderr b/tests/ui/codegen/bitvec-to-bools-opt-miscompile.stderr
index 500ace8f2753e..3eb03d3740fcd 100644
--- a/tests/ui/codegen/bitvec-to-bools-opt-miscompile.stderr
+++ b/tests/ui/codegen/bitvec-to-bools-opt-miscompile.stderr
@@ -1,5 +1,5 @@
 warning: trait `methods` is never used
-  --> $DIR/issue-2989.rs:4:7
+  --> $DIR/bitvec-to-bools-opt-miscompile.rs:6:7
    |
 LL | trait methods {
    |       ^^^^^^^
diff --git a/tests/ui/codegen/box-deref-segfault-misopt.rs b/tests/ui/codegen/box-deref-segfault-misopt.rs
index 538e89f224697..f764db35e8c29 100644
--- a/tests/ui/codegen/box-deref-segfault-misopt.rs
+++ b/tests/ui/codegen/box-deref-segfault-misopt.rs
@@ -1,5 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/30081>.
+//! Misoptimization caused this to segfault.
 //@ run-pass
-// This used to segfault #30081
 
 pub enum Instruction {
     Increment(i8),
diff --git a/tests/ui/drop/move-closure-drop-on-unwind.rs b/tests/ui/drop/move-closure-drop-on-unwind.rs
index 77a3885da042a..ad110c1de01c8 100644
--- a/tests/ui/drop/move-closure-drop-on-unwind.rs
+++ b/tests/ui/drop/move-closure-drop-on-unwind.rs
@@ -1,3 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/29946>.
+//! Test `FnOnce` impl closure's value gets properly dropped
+//! (during unwind as well).
+
 //@ run-pass
 //@ needs-unwind
 //@ ignore-backends: gcc
diff --git a/tests/ui/drop/panic-during-slice-init.rs b/tests/ui/drop/panic-during-slice-init.rs
index 09b832bb59d02..ddf1e01dd8e7a 100644
--- a/tests/ui/drop/panic-during-slice-init.rs
+++ b/tests/ui/drop/panic-during-slice-init.rs
@@ -1,9 +1,9 @@
-//@ run-pass
-// Regression test for Issue #30018. This is very similar to the
-// original reported test, except that the panic is wrapped in a
-// spawned thread to isolate the expected error result from the
-// SIGTRAP injected by the drop-flag consistency checking.
+//! Regression test for <https://github.com/rust-lang/rust/issues/30018>.
+//! This is very similar to the original reported test, except that the
+//! panic is wrapped in a spawned thread to isolate the expected error
+//! result from the SIGTRAP injected by the drop-flag consistency checking.
 
+//@ run-pass
 //@ needs-unwind
 //@ needs-threads
 //@ ignore-backends: gcc
diff --git a/tests/ui/privacy/fn-returns-unnameable-type.rs b/tests/ui/privacy/fn-returns-unnameable-type.rs
index 76b9429329631..1e4474cfafefa 100644
--- a/tests/ui/privacy/fn-returns-unnameable-type.rs
+++ b/tests/ui/privacy/fn-returns-unnameable-type.rs
@@ -1,5 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/29668>.
+//! Test functions can return unnameable types.
 //@ run-pass
-// Functions can return unnameable types
 
 mod m1 {
     mod m2 {
diff --git a/tests/ui/resolve/impl-method-cant-capture-env.rs b/tests/ui/resolve/impl-method-cant-capture-env.rs
index f1630afe1730e..57ef5b83e2ccb 100644
--- a/tests/ui/resolve/impl-method-cant-capture-env.rs
+++ b/tests/ui/resolve/impl-method-cant-capture-env.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/3021>.
+//! Ensure upvars from fn cannot be used in impl method block body.
+
 fn siphash(k0 : u64) {
 
     struct SipHash {
diff --git a/tests/ui/resolve/impl-method-cant-capture-env.stderr b/tests/ui/resolve/impl-method-cant-capture-env.stderr
index 48777fec0a3ff..360598dee5827 100644
--- a/tests/ui/resolve/impl-method-cant-capture-env.stderr
+++ b/tests/ui/resolve/impl-method-cant-capture-env.stderr
@@ -1,5 +1,5 @@
 error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/issue-3021-b.rs:9:22
+  --> $DIR/impl-method-cant-capture-env.rs:12:22
    |
 LL |            self.v0 = k0 ^ 0x736f6d6570736575;
    |                      ^^
diff --git a/tests/ui/resolve/impl-trait-for-type-cant-capture-env.rs b/tests/ui/resolve/impl-trait-for-type-cant-capture-env.rs
index a672261f8d681..29c4ca07c22f2 100644
--- a/tests/ui/resolve/impl-trait-for-type-cant-capture-env.rs
+++ b/tests/ui/resolve/impl-trait-for-type-cant-capture-env.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/3021>.
+//! Test accessing upvars in impl trait for type method is forbidden.
+
 trait SipHash {
     fn reset(&self);
 }
diff --git a/tests/ui/resolve/impl-trait-for-type-cant-capture-env.stderr b/tests/ui/resolve/impl-trait-for-type-cant-capture-env.stderr
index 5dc4f9542fee5..2c25f6b1b8954 100644
--- a/tests/ui/resolve/impl-trait-for-type-cant-capture-env.stderr
+++ b/tests/ui/resolve/impl-trait-for-type-cant-capture-env.stderr
@@ -1,5 +1,5 @@
 error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/issue-3021.rs:12:22
+  --> $DIR/impl-trait-for-type-cant-capture-env.rs:15:22
    |
 LL |            self.v0 = k0 ^ 0x736f6d6570736575;
    |                      ^^
diff --git a/tests/ui/resolve/outer-generic-in-trait-method.rs b/tests/ui/resolve/outer-generic-in-trait-method.rs
index bd21d1244235d..a31062f480463 100644
--- a/tests/ui/resolve/outer-generic-in-trait-method.rs
+++ b/tests/ui/resolve/outer-generic-in-trait-method.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/3021>.
+//! Test we can't use outer generic param in trait method defined in fn body.
+
 fn siphash<T>() {
 
     trait U {
diff --git a/tests/ui/resolve/outer-generic-in-trait-method.stderr b/tests/ui/resolve/outer-generic-in-trait-method.stderr
index d521d4f4a73ae..f85b9623a52f3 100644
--- a/tests/ui/resolve/outer-generic-in-trait-method.stderr
+++ b/tests/ui/resolve/outer-generic-in-trait-method.stderr
@@ -1,5 +1,5 @@
 error[E0401]: can't use generic parameters from outer item
-  --> $DIR/issue-3021-c.rs:4:24
+  --> $DIR/outer-generic-in-trait-method.rs:7:24
    |
 LL | fn siphash<T>() {
    |            - type parameter from outer item
@@ -16,7 +16,7 @@ LL |     trait U<T> {
    |            +++
 
 error[E0401]: can't use generic parameters from outer item
-  --> $DIR/issue-3021-c.rs:4:30
+  --> $DIR/outer-generic-in-trait-method.rs:7:30
    |
 LL | fn siphash<T>() {
    |            - type parameter from outer item
diff --git a/tests/ui/resolve/trait-impl-cant-capture-env.rs b/tests/ui/resolve/trait-impl-cant-capture-env.rs
index 1fb0002b2fc73..751e49f9863c9 100644
--- a/tests/ui/resolve/trait-impl-cant-capture-env.rs
+++ b/tests/ui/resolve/trait-impl-cant-capture-env.rs
@@ -1,3 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/3021>.
+//! Ensure upvars from fn cannot be used in impl method block body.
+
 trait SipHash {
     fn result(&self) -> u64;
     fn reset(&self);
diff --git a/tests/ui/resolve/trait-impl-cant-capture-env.stderr b/tests/ui/resolve/trait-impl-cant-capture-env.stderr
index 39e6e8c43e944..3c80960a235cb 100644
--- a/tests/ui/resolve/trait-impl-cant-capture-env.stderr
+++ b/tests/ui/resolve/trait-impl-cant-capture-env.stderr
@@ -1,5 +1,5 @@
 error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/issue-3021-d.rs:21:23
+  --> $DIR/trait-impl-cant-capture-env.rs:24:23
    |
 LL |             self.v0 = k0 ^ 0x736f6d6570736575;
    |                       ^^
@@ -7,7 +7,7 @@ LL |             self.v0 = k0 ^ 0x736f6d6570736575;
    = help: use the `|| { ... }` closure form instead
 
 error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/issue-3021-d.rs:22:23
+  --> $DIR/trait-impl-cant-capture-env.rs:25:23
    |
 LL |             self.v1 = k1 ^ 0x646f72616e646f6d;
    |                       ^^