Move libXtest into libX/tests

This change moves:

1. `libcoretest` into `libcore/tests`
2. `libcollectionstest` into `libcollections/tests`

This is a follow-up to #39561.

64 files changed, 10 insertions, 10 deletions

diff --git a/src/libcollections/Cargo.toml b/src/libcollections/Cargo.toml
index 02b2171a224..7e92404bc0d 100644
--- a/src/libcollections/Cargo.toml
+++ b/src/libcollections/Cargo.toml
@@ -13,8 +13,8 @@ core = { path = "../libcore" }
 std_unicode = { path = "../libstd_unicode" }
 
 [[test]]
-name = "collectionstest"
-path = "../libcollectionstest/lib.rs"
+name = "collectionstests"
+path = "../libcollections/tests/lib.rs"
 
 [[bench]]
 name = "collectionsbenches"
diff --git a/src/libcollectionstest/binary_heap.rs b/src/libcollections/tests/binary_heap.rs
index d284937a9e6..d284937a9e6 100644
--- a/src/libcollectionstest/binary_heap.rs
+++ b/src/libcollections/tests/binary_heap.rs
diff --git a/src/libcollectionstest/btree/map.rs b/src/libcollections/tests/btree/map.rs
index 2c899d96940..2c899d96940 100644
--- a/src/libcollectionstest/btree/map.rs
+++ b/src/libcollections/tests/btree/map.rs
diff --git a/src/libcollectionstest/btree/mod.rs b/src/libcollections/tests/btree/mod.rs
index ae8b18d0c9f..ae8b18d0c9f 100644
--- a/src/libcollectionstest/btree/mod.rs
+++ b/src/libcollections/tests/btree/mod.rs
diff --git a/src/libcollectionstest/btree/set.rs b/src/libcollections/tests/btree/set.rs
index 6171b8ba624..6171b8ba624 100644
--- a/src/libcollectionstest/btree/set.rs
+++ b/src/libcollections/tests/btree/set.rs
diff --git a/src/libcollectionstest/cow_str.rs b/src/libcollections/tests/cow_str.rs
index b29245121da..b29245121da 100644
--- a/src/libcollectionstest/cow_str.rs
+++ b/src/libcollections/tests/cow_str.rs
diff --git a/src/libcollectionstest/fmt.rs b/src/libcollections/tests/fmt.rs
index 70e21c65a18..70e21c65a18 100644
--- a/src/libcollectionstest/fmt.rs
+++ b/src/libcollections/tests/fmt.rs
diff --git a/src/libcollectionstest/lib.rs b/src/libcollections/tests/lib.rs
index 618eb386c0f..618eb386c0f 100644
--- a/src/libcollectionstest/lib.rs
+++ b/src/libcollections/tests/lib.rs
diff --git a/src/libcollectionstest/linked_list.rs b/src/libcollections/tests/linked_list.rs
index a59724a017b..a59724a017b 100644
--- a/src/libcollectionstest/linked_list.rs
+++ b/src/libcollections/tests/linked_list.rs
diff --git a/src/libcollectionstest/slice.rs b/src/libcollections/tests/slice.rs
index c3e5304fb2b..c3e5304fb2b 100644
--- a/src/libcollectionstest/slice.rs
+++ b/src/libcollections/tests/slice.rs
diff --git a/src/libcollectionstest/str.rs b/src/libcollections/tests/str.rs
index c9b7104fec4..c9b7104fec4 100644
--- a/src/libcollectionstest/str.rs
+++ b/src/libcollections/tests/str.rs
diff --git a/src/libcollectionstest/string.rs b/src/libcollections/tests/string.rs
index 2f021b9935d..2f021b9935d 100644
--- a/src/libcollectionstest/string.rs
+++ b/src/libcollections/tests/string.rs
diff --git a/src/libcollectionstest/vec.rs b/src/libcollections/tests/vec.rs
index 63df0eb7305..63df0eb7305 100644
--- a/src/libcollectionstest/vec.rs
+++ b/src/libcollections/tests/vec.rs
diff --git a/src/libcollectionstest/vec_deque.rs b/src/libcollections/tests/vec_deque.rs
index f2935c05d4f..f2935c05d4f 100644
--- a/src/libcollectionstest/vec_deque.rs
+++ b/src/libcollections/tests/vec_deque.rs
diff --git a/src/libcore/Cargo.toml b/src/libcore/Cargo.toml
index e847c7fa3a0..5af63aa970f 100644
--- a/src/libcore/Cargo.toml
+++ b/src/libcore/Cargo.toml
@@ -10,8 +10,8 @@ test = false
 bench = false
 
 [[test]]
-name = "coretest"
-path = "../libcoretest/lib.rs"
+name = "coretests"
+path = "../libcore/tests/lib.rs"
 
 [[bench]]
 name = "corebenches"
diff --git a/src/libcore/num/bignum.rs b/src/libcore/num/bignum.rs
index 8904322ca48..b5553fb2947 100644
--- a/src/libcore/num/bignum.rs
+++ b/src/libcore/num/bignum.rs
@@ -19,7 +19,7 @@
 //! inputs, but we don't do so to avoid the code bloat. Each bignum is still
 //! tracked for the actual usages, so it normally doesn't matter.
 
-// This module is only for dec2flt and flt2dec, and only public because of libcoretest.
+// This module is only for dec2flt and flt2dec, and only public because of coretests.
 // It is not intended to ever be stabilized.
 #![doc(hidden)]
 #![unstable(feature = "core_private_bignum",
diff --git a/src/libcore/num/diy_float.rs b/src/libcore/num/diy_float.rs
index 11eea753f93..6635d95155f 100644
--- a/src/libcore/num/diy_float.rs
+++ b/src/libcore/num/diy_float.rs
@@ -10,7 +10,7 @@
 
 //! Extended precision "soft float", for internal use only.
 
-// This module is only for dec2flt and flt2dec, and only public because of libcoretest.
+// This module is only for dec2flt and flt2dec, and only public because of coretests.
 // It is not intended to ever be stabilized.
 #![doc(hidden)]
 #![unstable(feature = "core_private_diy_float",
diff --git a/src/libcore/num/flt2dec/mod.rs b/src/libcore/num/flt2dec/mod.rs
index f6c03a59f81..5123e42df61 100644
--- a/src/libcore/num/flt2dec/mod.rs
+++ b/src/libcore/num/flt2dec/mod.rs
@@ -118,7 +118,7 @@ provide a large enough buffer and `Part` array, and to assemble the final
 string from resulting `Part`s itself.
 
 All algorithms and formatting functions are accompanied by extensive tests
-in `coretest::num::flt2dec` module. It also shows how to use individual
+in `coretests::num::flt2dec` module. It also shows how to use individual
 functions.
 
 */
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index df343c9d45f..f665cfdee77 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -90,7 +90,7 @@ impl<T: fmt::UpperHex> fmt::UpperHex for Wrapping<T> {
 
 mod wrapping;
 
-// All these modules are technically private and only exposed for libcoretest:
+// All these modules are technically private and only exposed for coretests:
 pub mod flt2dec;
 pub mod dec2flt;
 pub mod bignum;
diff --git a/src/libcoretest/any.rs b/src/libcore/tests/any.rs
index 2d3e81aa131..2d3e81aa131 100644
--- a/src/libcoretest/any.rs
+++ b/src/libcore/tests/any.rs
diff --git a/src/libcoretest/array.rs b/src/libcore/tests/array.rs
index 6af031dee58..6af031dee58 100644
--- a/src/libcoretest/array.rs
+++ b/src/libcore/tests/array.rs
diff --git a/src/libcoretest/atomic.rs b/src/libcore/tests/atomic.rs
index b6bb5fddf4a..b6bb5fddf4a 100644
--- a/src/libcoretest/atomic.rs
+++ b/src/libcore/tests/atomic.rs
diff --git a/src/libcoretest/cell.rs b/src/libcore/tests/cell.rs
index 8585f2f0871..8585f2f0871 100644
--- a/src/libcoretest/cell.rs
+++ b/src/libcore/tests/cell.rs
diff --git a/src/libcoretest/char.rs b/src/libcore/tests/char.rs
index e4012ec91e2..e4012ec91e2 100644
--- a/src/libcoretest/char.rs
+++ b/src/libcore/tests/char.rs
diff --git a/src/libcoretest/clone.rs b/src/libcore/tests/clone.rs
index 91d68ba3344..91d68ba3344 100644
--- a/src/libcoretest/clone.rs
+++ b/src/libcore/tests/clone.rs
diff --git a/src/libcoretest/cmp.rs b/src/libcore/tests/cmp.rs
index e3c65ad8b33..e3c65ad8b33 100644
--- a/src/libcoretest/cmp.rs
+++ b/src/libcore/tests/cmp.rs
diff --git a/src/libcoretest/fmt/builders.rs b/src/libcore/tests/fmt/builders.rs
index e71e61bda5e..e71e61bda5e 100644
--- a/src/libcoretest/fmt/builders.rs
+++ b/src/libcore/tests/fmt/builders.rs
diff --git a/src/libcoretest/fmt/float.rs b/src/libcore/tests/fmt/float.rs
index 695001312e4..695001312e4 100644
--- a/src/libcoretest/fmt/float.rs
+++ b/src/libcore/tests/fmt/float.rs
diff --git a/src/libcoretest/fmt/mod.rs b/src/libcore/tests/fmt/mod.rs
index 5d204c7d523..5d204c7d523 100644
--- a/src/libcoretest/fmt/mod.rs
+++ b/src/libcore/tests/fmt/mod.rs
diff --git a/src/libcoretest/fmt/num.rs b/src/libcore/tests/fmt/num.rs
index 4ddedd91004..4ddedd91004 100644
--- a/src/libcoretest/fmt/num.rs
+++ b/src/libcore/tests/fmt/num.rs
diff --git a/src/libcoretest/hash/mod.rs b/src/libcore/tests/hash/mod.rs
index 53ac17c052f..53ac17c052f 100644
--- a/src/libcoretest/hash/mod.rs
+++ b/src/libcore/tests/hash/mod.rs
diff --git a/src/libcoretest/hash/sip.rs b/src/libcore/tests/hash/sip.rs
index 4a9657e0340..4a9657e0340 100644
--- a/src/libcoretest/hash/sip.rs
+++ b/src/libcore/tests/hash/sip.rs
diff --git a/src/libcoretest/intrinsics.rs b/src/libcore/tests/intrinsics.rs
index 2b380abf63c..2b380abf63c 100644
--- a/src/libcoretest/intrinsics.rs
+++ b/src/libcore/tests/intrinsics.rs
diff --git a/src/libcoretest/iter.rs b/src/libcore/tests/iter.rs
index 08442f9bcbf..08442f9bcbf 100644
--- a/src/libcoretest/iter.rs
+++ b/src/libcore/tests/iter.rs
diff --git a/src/libcoretest/lib.rs b/src/libcore/tests/lib.rs
index d92c378160d..d92c378160d 100644
--- a/src/libcoretest/lib.rs
+++ b/src/libcore/tests/lib.rs
diff --git a/src/libcoretest/mem.rs b/src/libcore/tests/mem.rs
index 86e59c736ba..86e59c736ba 100644
--- a/src/libcoretest/mem.rs
+++ b/src/libcore/tests/mem.rs
diff --git a/src/libcoretest/nonzero.rs b/src/libcore/tests/nonzero.rs
index 7a367ddeec8..7a367ddeec8 100644
--- a/src/libcoretest/nonzero.rs
+++ b/src/libcore/tests/nonzero.rs
diff --git a/src/libcoretest/num/bignum.rs b/src/libcore/tests/num/bignum.rs
index 58a9dd1b128..58a9dd1b128 100644
--- a/src/libcoretest/num/bignum.rs
+++ b/src/libcore/tests/num/bignum.rs
diff --git a/src/libcoretest/num/dec2flt/mod.rs b/src/libcore/tests/num/dec2flt/mod.rs
index 5d546c643e7..5d546c643e7 100644
--- a/src/libcoretest/num/dec2flt/mod.rs
+++ b/src/libcore/tests/num/dec2flt/mod.rs
diff --git a/src/libcoretest/num/dec2flt/parse.rs b/src/libcore/tests/num/dec2flt/parse.rs
index 09acf2bc517..09acf2bc517 100644
--- a/src/libcoretest/num/dec2flt/parse.rs
+++ b/src/libcore/tests/num/dec2flt/parse.rs
diff --git a/src/libcoretest/num/dec2flt/rawfp.rs b/src/libcore/tests/num/dec2flt/rawfp.rs
index 1a3533317da..1a3533317da 100644
--- a/src/libcoretest/num/dec2flt/rawfp.rs
+++ b/src/libcore/tests/num/dec2flt/rawfp.rs
diff --git a/src/libcoretest/num/flt2dec/estimator.rs b/src/libcore/tests/num/flt2dec/estimator.rs
index 0bca616ea9a..0bca616ea9a 100644
--- a/src/libcoretest/num/flt2dec/estimator.rs
+++ b/src/libcore/tests/num/flt2dec/estimator.rs
diff --git a/src/libcoretest/num/flt2dec/mod.rs b/src/libcore/tests/num/flt2dec/mod.rs
index 0f4d19e7092..0f4d19e7092 100644
--- a/src/libcoretest/num/flt2dec/mod.rs
+++ b/src/libcore/tests/num/flt2dec/mod.rs
diff --git a/src/libcoretest/num/flt2dec/strategy/dragon.rs b/src/libcore/tests/num/flt2dec/strategy/dragon.rs
index 4edb0f3df60..4edb0f3df60 100644
--- a/src/libcoretest/num/flt2dec/strategy/dragon.rs
+++ b/src/libcore/tests/num/flt2dec/strategy/dragon.rs
diff --git a/src/libcoretest/num/flt2dec/strategy/grisu.rs b/src/libcore/tests/num/flt2dec/strategy/grisu.rs
index 79e66ee669e..79e66ee669e 100644
--- a/src/libcoretest/num/flt2dec/strategy/grisu.rs
+++ b/src/libcore/tests/num/flt2dec/strategy/grisu.rs
diff --git a/src/libcoretest/num/i16.rs b/src/libcore/tests/num/i16.rs
index 7435831ac6d..7435831ac6d 100644
--- a/src/libcoretest/num/i16.rs
+++ b/src/libcore/tests/num/i16.rs
diff --git a/src/libcoretest/num/i32.rs b/src/libcore/tests/num/i32.rs
index 3b3407e1ada..3b3407e1ada 100644
--- a/src/libcoretest/num/i32.rs
+++ b/src/libcore/tests/num/i32.rs
diff --git a/src/libcoretest/num/i64.rs b/src/libcore/tests/num/i64.rs
index 9e1aec256ee..9e1aec256ee 100644
--- a/src/libcoretest/num/i64.rs
+++ b/src/libcore/tests/num/i64.rs
diff --git a/src/libcoretest/num/i8.rs b/src/libcore/tests/num/i8.rs
index f72244239b2..f72244239b2 100644
--- a/src/libcoretest/num/i8.rs
+++ b/src/libcore/tests/num/i8.rs
diff --git a/src/libcoretest/num/int_macros.rs b/src/libcore/tests/num/int_macros.rs
index 8d791283ab8..8d791283ab8 100644
--- a/src/libcoretest/num/int_macros.rs
+++ b/src/libcore/tests/num/int_macros.rs
diff --git a/src/libcoretest/num/mod.rs b/src/libcore/tests/num/mod.rs
index 51737c9c3b4..51737c9c3b4 100644
--- a/src/libcoretest/num/mod.rs
+++ b/src/libcore/tests/num/mod.rs
diff --git a/src/libcoretest/num/u16.rs b/src/libcore/tests/num/u16.rs
index 8455207583c..8455207583c 100644
--- a/src/libcoretest/num/u16.rs
+++ b/src/libcore/tests/num/u16.rs
diff --git a/src/libcoretest/num/u32.rs b/src/libcore/tests/num/u32.rs
index b44e60f6529..b44e60f6529 100644
--- a/src/libcoretest/num/u32.rs
+++ b/src/libcore/tests/num/u32.rs
diff --git a/src/libcoretest/num/u64.rs b/src/libcore/tests/num/u64.rs
index ffcd1015d58..ffcd1015d58 100644
--- a/src/libcoretest/num/u64.rs
+++ b/src/libcore/tests/num/u64.rs
diff --git a/src/libcoretest/num/u8.rs b/src/libcore/tests/num/u8.rs
index 4ee14e22f2d..4ee14e22f2d 100644
--- a/src/libcoretest/num/u8.rs
+++ b/src/libcore/tests/num/u8.rs
diff --git a/src/libcoretest/num/uint_macros.rs b/src/libcore/tests/num/uint_macros.rs
index daa1cc3a7f4..daa1cc3a7f4 100644
--- a/src/libcoretest/num/uint_macros.rs
+++ b/src/libcore/tests/num/uint_macros.rs
diff --git a/src/libcoretest/ops.rs b/src/libcore/tests/ops.rs
index 1c6c13b0d02..1c6c13b0d02 100644
--- a/src/libcoretest/ops.rs
+++ b/src/libcore/tests/ops.rs
diff --git a/src/libcoretest/option.rs b/src/libcore/tests/option.rs
index 51b0655f680..51b0655f680 100644
--- a/src/libcoretest/option.rs
+++ b/src/libcore/tests/option.rs
diff --git a/src/libcoretest/ptr.rs b/src/libcore/tests/ptr.rs
index 7f6f472bfbb..7f6f472bfbb 100644
--- a/src/libcoretest/ptr.rs
+++ b/src/libcore/tests/ptr.rs
diff --git a/src/libcoretest/result.rs b/src/libcore/tests/result.rs
index 4c5f19dee12..4c5f19dee12 100644
--- a/src/libcoretest/result.rs
+++ b/src/libcore/tests/result.rs
diff --git a/src/libcoretest/slice.rs b/src/libcore/tests/slice.rs
index ec38345030f..ec38345030f 100644
--- a/src/libcoretest/slice.rs
+++ b/src/libcore/tests/slice.rs
diff --git a/src/libcoretest/str.rs b/src/libcore/tests/str.rs
index b7d9ba4463d..08daafccc54 100644
--- a/src/libcoretest/str.rs
+++ b/src/libcore/tests/str.rs
@@ -8,4 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// All `str` tests live in libcollectiontest::str
+// All `str` tests live in collectionstests::str
diff --git a/src/libcoretest/tuple.rs b/src/libcore/tests/tuple.rs
index 4fe5e0a740b..4fe5e0a740b 100644
--- a/src/libcoretest/tuple.rs
+++ b/src/libcore/tests/tuple.rs
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
index 3808c05c6b9..0dbf0d4316a 100644
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@@ -75,7 +75,7 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
     "src/libtest", // Probably should defer to unstable std::sys APIs
 
     // std testing crates, ok for now at least
-    "src/libcoretest",
+    "src/libcore/tests",
 
     // non-std crates
     "src/test",