From 46d53a68aa1b10833ec25178171f34e29e71f1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Le=C3=B3n=20Orell=20Valerian=20Liehr?= <me@fmease.dev>
Date: Wed, 10 Jul 2024 17:22:40 +0200
Subject: [PATCH] Move `#![crate_type]` UI tests into attributes directory

Gets rid of two top-level UI tests which is always great.

Furthermore, move `need-crate-arg-ignore-tidy$x.rs`
from `command/` to `invalid-compile-flags/`.
`command/` concerns `std::process::Command` tests, not CLI tests.
---
 .../crate-type-delimited.rs}                                    | 0
 .../crate-type-delimited.stderr}                                | 2 +-
 tests/ui/{no_crate_type.rs => attributes/crate-type-empty.rs}   | 0
 .../crate-type-empty.stderr}                                    | 2 +-
 .../crate-type-macro-call.rs}                                   | 0
 .../crate-type-macro-call.stderr}                               | 2 +-
 .../need-crate-arg-ignore-tidy$x.rs                             | 0
 .../need-crate-arg-ignore-tidy$x.stderr                         | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/ui/{invalid_crate_type_syntax.rs => attributes/crate-type-delimited.rs} (100%)
 rename tests/ui/{invalid_crate_type_syntax.stderr => attributes/crate-type-delimited.stderr} (82%)
 rename tests/ui/{no_crate_type.rs => attributes/crate-type-empty.rs} (100%)
 rename tests/ui/{no_crate_type.stderr => attributes/crate-type-empty.stderr} (84%)
 rename tests/ui/{invalid/invalid-crate-type-macro.rs => attributes/crate-type-macro-call.rs} (100%)
 rename tests/ui/{invalid/invalid-crate-type-macro.stderr => attributes/crate-type-macro-call.stderr} (83%)
 rename tests/ui/{command => invalid-compile-flags}/need-crate-arg-ignore-tidy$x.rs (100%)
 rename tests/ui/{command => invalid-compile-flags}/need-crate-arg-ignore-tidy$x.stderr (100%)

diff --git a/tests/ui/invalid_crate_type_syntax.rs b/tests/ui/attributes/crate-type-delimited.rs
similarity index 100%
rename from tests/ui/invalid_crate_type_syntax.rs
rename to tests/ui/attributes/crate-type-delimited.rs
diff --git a/tests/ui/invalid_crate_type_syntax.stderr b/tests/ui/attributes/crate-type-delimited.stderr
similarity index 82%
rename from tests/ui/invalid_crate_type_syntax.stderr
rename to tests/ui/attributes/crate-type-delimited.stderr
index a5563720f622..0bbbe07b1981 100644
--- a/tests/ui/invalid_crate_type_syntax.stderr
+++ b/tests/ui/attributes/crate-type-delimited.stderr
@@ -1,5 +1,5 @@
 error: malformed `crate_type` attribute input
-  --> $DIR/invalid_crate_type_syntax.rs:2:1
+  --> $DIR/crate-type-delimited.rs:2:1
    |
 LL | #![crate_type(lib)]
    | ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![crate_type = "bin|lib|..."]`
diff --git a/tests/ui/no_crate_type.rs b/tests/ui/attributes/crate-type-empty.rs
similarity index 100%
rename from tests/ui/no_crate_type.rs
rename to tests/ui/attributes/crate-type-empty.rs
diff --git a/tests/ui/no_crate_type.stderr b/tests/ui/attributes/crate-type-empty.stderr
similarity index 84%
rename from tests/ui/no_crate_type.stderr
rename to tests/ui/attributes/crate-type-empty.stderr
index 85d8f87afa67..b9279d961eef 100644
--- a/tests/ui/no_crate_type.stderr
+++ b/tests/ui/attributes/crate-type-empty.stderr
@@ -1,5 +1,5 @@
 error: malformed `crate_type` attribute input
-  --> $DIR/no_crate_type.rs:2:1
+  --> $DIR/crate-type-empty.rs:2:1
    |
 LL | #![crate_type]
    | ^^^^^^^^^^^^^^ help: must be of the form: `#![crate_type = "bin|lib|..."]`
diff --git a/tests/ui/invalid/invalid-crate-type-macro.rs b/tests/ui/attributes/crate-type-macro-call.rs
similarity index 100%
rename from tests/ui/invalid/invalid-crate-type-macro.rs
rename to tests/ui/attributes/crate-type-macro-call.rs
diff --git a/tests/ui/invalid/invalid-crate-type-macro.stderr b/tests/ui/attributes/crate-type-macro-call.stderr
similarity index 83%
rename from tests/ui/invalid/invalid-crate-type-macro.stderr
rename to tests/ui/attributes/crate-type-macro-call.stderr
index 1cf77d4086bb..6ccc3edf885e 100644
--- a/tests/ui/invalid/invalid-crate-type-macro.stderr
+++ b/tests/ui/attributes/crate-type-macro-call.stderr
@@ -1,5 +1,5 @@
 error: malformed `crate_type` attribute input
-  --> $DIR/invalid-crate-type-macro.rs:1:1
+  --> $DIR/crate-type-macro-call.rs:1:1
    |
 LL | #![crate_type = foo!()]
    | ^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![crate_type = "bin|lib|..."]`
diff --git a/tests/ui/command/need-crate-arg-ignore-tidy$x.rs b/tests/ui/invalid-compile-flags/need-crate-arg-ignore-tidy$x.rs
similarity index 100%
rename from tests/ui/command/need-crate-arg-ignore-tidy$x.rs
rename to tests/ui/invalid-compile-flags/need-crate-arg-ignore-tidy$x.rs
diff --git a/tests/ui/command/need-crate-arg-ignore-tidy$x.stderr b/tests/ui/invalid-compile-flags/need-crate-arg-ignore-tidy$x.stderr
similarity index 100%
rename from tests/ui/command/need-crate-arg-ignore-tidy$x.stderr
rename to tests/ui/invalid-compile-flags/need-crate-arg-ignore-tidy$x.stderr