From a73ad6b22a132a3b990f0f495df8b62a775ab8e0 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Thu, 31 Dec 2020 08:15:53 +0900
Subject: [PATCH] Move builtin-superkinds-related tests

---
 src/test/ui/auxiliary/trait_superkinds_in_metadata.rs     | 8 --------
 .../builtin-superkinds-capabilities-transitive.rs         | 0
 .../builtin-superkinds-capabilities-xc.rs                 | 0
 .../builtin-superkinds-capabilities.rs                    | 0
 .../builtin-superkinds-in-metadata2.rs}                   | 0
 .../builtin-superkinds-phantom-typaram.rs                 | 0
 .../builtin-superkinds-simple2.rs}                        | 0
 .../builtin-superkinds-typaram.rs                         | 0
 8 files changed, 8 deletions(-)
 delete mode 100644 src/test/ui/auxiliary/trait_superkinds_in_metadata.rs
 rename src/test/ui/{ => builtin-superkinds}/builtin-superkinds-capabilities-transitive.rs (100%)
 rename src/test/ui/{ => builtin-superkinds}/builtin-superkinds-capabilities-xc.rs (100%)
 rename src/test/ui/{ => builtin-superkinds}/builtin-superkinds-capabilities.rs (100%)
 rename src/test/ui/{builtin-superkinds-in-metadata.rs => builtin-superkinds/builtin-superkinds-in-metadata2.rs} (100%)
 rename src/test/ui/{ => builtin-superkinds}/builtin-superkinds-phantom-typaram.rs (100%)
 rename src/test/ui/{builtin-superkinds-simple.rs => builtin-superkinds/builtin-superkinds-simple2.rs} (100%)
 rename src/test/ui/{ => builtin-superkinds}/builtin-superkinds-typaram.rs (100%)

diff --git a/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs b/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs
deleted file mode 100644
index acfd1e13e93..00000000000
--- a/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test library crate for cross-crate usages of traits inheriting
-// from the builtin kinds. Mostly tests metadata correctness.
-
-#![crate_type="lib"]
-
-pub trait RequiresShare : Sync { }
-pub trait RequiresRequiresShareAndSend : RequiresShare + Send { }
-pub trait RequiresCopy : Copy { }
diff --git a/src/test/ui/builtin-superkinds-capabilities-transitive.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs
similarity index 100%
rename from src/test/ui/builtin-superkinds-capabilities-transitive.rs
rename to src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs
diff --git a/src/test/ui/builtin-superkinds-capabilities-xc.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs
similarity index 100%
rename from src/test/ui/builtin-superkinds-capabilities-xc.rs
rename to src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs
diff --git a/src/test/ui/builtin-superkinds-capabilities.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities.rs
similarity index 100%
rename from src/test/ui/builtin-superkinds-capabilities.rs
rename to src/test/ui/builtin-superkinds/builtin-superkinds-capabilities.rs
diff --git a/src/test/ui/builtin-superkinds-in-metadata.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs
similarity index 100%
rename from src/test/ui/builtin-superkinds-in-metadata.rs
rename to src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs
diff --git a/src/test/ui/builtin-superkinds-phantom-typaram.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs
similarity index 100%
rename from src/test/ui/builtin-superkinds-phantom-typaram.rs
rename to src/test/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs
diff --git a/src/test/ui/builtin-superkinds-simple.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-simple2.rs
similarity index 100%
rename from src/test/ui/builtin-superkinds-simple.rs
rename to src/test/ui/builtin-superkinds/builtin-superkinds-simple2.rs
diff --git a/src/test/ui/builtin-superkinds-typaram.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram.rs
similarity index 100%
rename from src/test/ui/builtin-superkinds-typaram.rs
rename to src/test/ui/builtin-superkinds/builtin-superkinds-typaram.rs
-- 
GitLab