From c978c8986f700bc8fa83b5f98cc96f41772fa281 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Thu, 19 Jun 2025 06:20:05 +0000
Subject: [PATCH] Move some `issues-*` tests to better homes

These tests were updated in the previous commit; while they are being
cleaned up, move them to a non-issue directory.
---
 src/tools/tidy/src/issues.txt                               | 2 --
 src/tools/tidy/src/ui_tests.rs                              | 2 +-
 .../issue-32950.rs => derives/nonsense-input-to-debug.rs}   | 0
 .../nonsense-input-to-debug.stderr}                         | 6 +++---
 .../macro-metavar-expr-concat/empty-input.rs}               | 0
 .../macro-metavar-expr-concat/empty-input.stderr}           | 4 ++--
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename tests/ui/{issues/issue-32950.rs => derives/nonsense-input-to-debug.rs} (100%)
 rename tests/ui/{issues/issue-32950.stderr => derives/nonsense-input-to-debug.stderr} (88%)
 rename tests/ui/{issues/issue-50403.rs => macros/macro-metavar-expr-concat/empty-input.rs} (100%)
 rename tests/ui/{issues/issue-50403.stderr => macros/macro-metavar-expr-concat/empty-input.stderr} (88%)

diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 045f2f0692a1..1ca3b045b74c 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -2071,7 +2071,6 @@ ui/issues/issue-32782.rs
 ui/issues/issue-32797.rs
 ui/issues/issue-32805.rs
 ui/issues/issue-3290.rs
-ui/issues/issue-32950.rs
 ui/issues/issue-32995-2.rs
 ui/issues/issue-32995.rs
 ui/issues/issue-33202.rs
@@ -2341,7 +2340,6 @@ ui/issues/issue-49934.rs
 ui/issues/issue-49955.rs
 ui/issues/issue-49973.rs
 ui/issues/issue-50187.rs
-ui/issues/issue-50403.rs
 ui/issues/issue-50411.rs
 ui/issues/issue-50415.rs
 ui/issues/issue-50442.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 8f9b07c49acb..53226fcb80e6 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -17,7 +17,7 @@ use ignore::Walk;
 const ENTRY_LIMIT: u32 = 901;
 // FIXME: The following limits should be reduced eventually.
 
-const ISSUES_ENTRY_LIMIT: u32 = 1623;
+const ISSUES_ENTRY_LIMIT: u32 = 1619;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files
diff --git a/tests/ui/issues/issue-32950.rs b/tests/ui/derives/nonsense-input-to-debug.rs
similarity index 100%
rename from tests/ui/issues/issue-32950.rs
rename to tests/ui/derives/nonsense-input-to-debug.rs
diff --git a/tests/ui/issues/issue-32950.stderr b/tests/ui/derives/nonsense-input-to-debug.stderr
similarity index 88%
rename from tests/ui/issues/issue-32950.stderr
rename to tests/ui/derives/nonsense-input-to-debug.stderr
index ee3b5810e7dd..7c97ca93cfc9 100644
--- a/tests/ui/issues/issue-32950.stderr
+++ b/tests/ui/derives/nonsense-input-to-debug.stderr
@@ -1,11 +1,11 @@
 error: `derive` cannot be used on items with type macros
-  --> $DIR/issue-32950.rs:7:22
+  --> $DIR/nonsense-input-to-debug.rs:7:22
    |
 LL |     should_be_vec_t: vec![T],
    |                      ^^^^^^^
 
 error: expected type, found `expr` metavariable
-  --> $DIR/issue-32950.rs:7:22
+  --> $DIR/nonsense-input-to-debug.rs:7:22
    |
 LL |     should_be_vec_t: vec![T],
    |                      ^^^^^^^
@@ -17,7 +17,7 @@ LL |     should_be_vec_t: vec![T],
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0392]: type parameter `T` is never used
-  --> $DIR/issue-32950.rs:5:17
+  --> $DIR/nonsense-input-to-debug.rs:5:17
    |
 LL | struct Nonsense<T> {
    |                 ^ unused type parameter
diff --git a/tests/ui/issues/issue-50403.rs b/tests/ui/macros/macro-metavar-expr-concat/empty-input.rs
similarity index 100%
rename from tests/ui/issues/issue-50403.rs
rename to tests/ui/macros/macro-metavar-expr-concat/empty-input.rs
diff --git a/tests/ui/issues/issue-50403.stderr b/tests/ui/macros/macro-metavar-expr-concat/empty-input.stderr
similarity index 88%
rename from tests/ui/issues/issue-50403.stderr
rename to tests/ui/macros/macro-metavar-expr-concat/empty-input.stderr
index cb4d372f6fea..e95032dd2478 100644
--- a/tests/ui/issues/issue-50403.stderr
+++ b/tests/ui/macros/macro-metavar-expr-concat/empty-input.stderr
@@ -1,11 +1,11 @@
 error: expected identifier or string literal
-  --> $DIR/issue-50403.rs:6:14
+  --> $DIR/empty-input.rs:6:14
    |
 LL |     () => { ${concat()} }
    |              ^^^^^^^^^^
 
 error: expected expression, found `$`
-  --> $DIR/issue-50403.rs:6:13
+  --> $DIR/empty-input.rs:6:13
    |
 LL |     () => { ${concat()} }
    |             ^ expected expression