From 61f6fa70ac2e7bf79eb46bd959345115596282c4 Mon Sep 17 00:00:00 2001
From: Bastian Kauschke <bastian_kauschke@hotmail.de>
Date: Thu, 28 Jan 2021 18:42:44 +0100
Subject: [PATCH] move a bunch of tests

---
 src/test/ui/{ => cast}/fat-ptr-cast-rpass.rs    | 0
 src/test/ui/{ => cast}/fat-ptr-cast.rs          | 0
 src/test/ui/{ => cast}/fat-ptr-cast.stderr      | 0
 src/test/ui/{issues => cast}/issue-17444.rs     | 0
 src/test/ui/{issues => cast}/issue-17444.stderr | 0
 src/test/ui/cast/unsupported-cast.rs            | 5 +++++
 src/test/ui/{ => cast}/unsupported-cast.stderr  | 4 ++--
 src/test/ui/unsupported-cast.rs                 | 7 -------
 8 files changed, 7 insertions(+), 9 deletions(-)
 rename src/test/ui/{ => cast}/fat-ptr-cast-rpass.rs (100%)
 rename src/test/ui/{ => cast}/fat-ptr-cast.rs (100%)
 rename src/test/ui/{ => cast}/fat-ptr-cast.stderr (100%)
 rename src/test/ui/{issues => cast}/issue-17444.rs (100%)
 rename src/test/ui/{issues => cast}/issue-17444.stderr (100%)
 create mode 100644 src/test/ui/cast/unsupported-cast.rs
 rename src/test/ui/{ => cast}/unsupported-cast.stderr (65%)
 delete mode 100644 src/test/ui/unsupported-cast.rs

diff --git a/src/test/ui/fat-ptr-cast-rpass.rs b/src/test/ui/cast/fat-ptr-cast-rpass.rs
similarity index 100%
rename from src/test/ui/fat-ptr-cast-rpass.rs
rename to src/test/ui/cast/fat-ptr-cast-rpass.rs
diff --git a/src/test/ui/fat-ptr-cast.rs b/src/test/ui/cast/fat-ptr-cast.rs
similarity index 100%
rename from src/test/ui/fat-ptr-cast.rs
rename to src/test/ui/cast/fat-ptr-cast.rs
diff --git a/src/test/ui/fat-ptr-cast.stderr b/src/test/ui/cast/fat-ptr-cast.stderr
similarity index 100%
rename from src/test/ui/fat-ptr-cast.stderr
rename to src/test/ui/cast/fat-ptr-cast.stderr
diff --git a/src/test/ui/issues/issue-17444.rs b/src/test/ui/cast/issue-17444.rs
similarity index 100%
rename from src/test/ui/issues/issue-17444.rs
rename to src/test/ui/cast/issue-17444.rs
diff --git a/src/test/ui/issues/issue-17444.stderr b/src/test/ui/cast/issue-17444.stderr
similarity index 100%
rename from src/test/ui/issues/issue-17444.stderr
rename to src/test/ui/cast/issue-17444.stderr
diff --git a/src/test/ui/cast/unsupported-cast.rs b/src/test/ui/cast/unsupported-cast.rs
new file mode 100644
index 00000000000..1384ecc6ef2
--- /dev/null
+++ b/src/test/ui/cast/unsupported-cast.rs
@@ -0,0 +1,5 @@
+struct A;
+
+fn main() {
+  println!("{:?}", 1.0 as *const A); //~ERROR  casting `f64` as `*const A` is invalid
+}
diff --git a/src/test/ui/unsupported-cast.stderr b/src/test/ui/cast/unsupported-cast.stderr
similarity index 65%
rename from src/test/ui/unsupported-cast.stderr
rename to src/test/ui/cast/unsupported-cast.stderr
index 63e7713d2f4..56a375a1d94 100644
--- a/src/test/ui/unsupported-cast.stderr
+++ b/src/test/ui/cast/unsupported-cast.stderr
@@ -1,7 +1,7 @@
 error[E0606]: casting `f64` as `*const A` is invalid
-  --> $DIR/unsupported-cast.rs:6:20
+  --> $DIR/unsupported-cast.rs:4:20
    |
-LL |   println!("{:?}", 1.0 as *const A); // Can't cast float to foreign.
+LL |   println!("{:?}", 1.0 as *const A);
    |                    ^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/unsupported-cast.rs b/src/test/ui/unsupported-cast.rs
deleted file mode 100644
index cb6a57a4d39..00000000000
--- a/src/test/ui/unsupported-cast.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// error-pattern:casting
-
-struct A;
-
-fn main() {
-  println!("{:?}", 1.0 as *const A); // Can't cast float to foreign.
-}