rust-lang · bors · Apr 6, 2017 · Apr 3, 2017
diff --git 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 → src/libcollections/tests/binary_heap.rs b/src/libcollectionstest/binary_heap.rs → src/libcollections/tests/binary_heap.rs
diff --git a/src/libcollectionstest/btree/map.rs → src/libcollections/tests/btree/map.rs b/src/libcollectionstest/btree/map.rs → src/libcollections/tests/btree/map.rs
diff --git a/src/libcollectionstest/btree/mod.rs → src/libcollections/tests/btree/mod.rs b/src/libcollectionstest/btree/mod.rs → src/libcollections/tests/btree/mod.rs
diff --git a/src/libcollectionstest/btree/set.rs → src/libcollections/tests/btree/set.rs b/src/libcollectionstest/btree/set.rs → src/libcollections/tests/btree/set.rs
diff --git a/src/libcollectionstest/cow_str.rs → src/libcollections/tests/cow_str.rs b/src/libcollectionstest/cow_str.rs → src/libcollections/tests/cow_str.rs
diff --git a/src/libcollectionstest/fmt.rs → src/libcollections/tests/fmt.rs b/src/libcollectionstest/fmt.rs → src/libcollections/tests/fmt.rs
diff --git a/src/libcollectionstest/lib.rs → src/libcollections/tests/lib.rs b/src/libcollectionstest/lib.rs → src/libcollections/tests/lib.rs
diff --git a/src/libcollectionstest/linked_list.rs → src/libcollections/tests/linked_list.rs b/src/libcollectionstest/linked_list.rs → src/libcollections/tests/linked_list.rs
diff --git a/src/libcollectionstest/slice.rs → src/libcollections/tests/slice.rs b/src/libcollectionstest/slice.rs → src/libcollections/tests/slice.rs
diff --git a/src/libcollectionstest/str.rs → src/libcollections/tests/str.rs b/src/libcollectionstest/str.rs → src/libcollections/tests/str.rs
diff --git a/src/libcollectionstest/string.rs → src/libcollections/tests/string.rs b/src/libcollectionstest/string.rs → src/libcollections/tests/string.rs
diff --git a/src/libcollectionstest/vec.rs → src/libcollections/tests/vec.rs b/src/libcollectionstest/vec.rs → src/libcollections/tests/vec.rs
diff --git a/src/libcollectionstest/vec_deque.rs → src/libcollections/tests/vec_deque.rs b/src/libcollectionstest/vec_deque.rs → src/libcollections/tests/vec_deque.rs
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → src/libcore/tests/any.rs b/src/libcoretest/any.rs → src/libcore/tests/any.rs
diff --git a/src/libcoretest/array.rs → src/libcore/tests/array.rs b/src/libcoretest/array.rs → src/libcore/tests/array.rs
diff --git a/src/libcoretest/atomic.rs → src/libcore/tests/atomic.rs b/src/libcoretest/atomic.rs → src/libcore/tests/atomic.rs
diff --git a/src/libcoretest/cell.rs → src/libcore/tests/cell.rs b/src/libcoretest/cell.rs → src/libcore/tests/cell.rs
diff --git a/src/libcoretest/char.rs → src/libcore/tests/char.rs b/src/libcoretest/char.rs → src/libcore/tests/char.rs
diff --git a/src/libcoretest/clone.rs → src/libcore/tests/clone.rs b/src/libcoretest/clone.rs → src/libcore/tests/clone.rs
diff --git a/src/libcoretest/cmp.rs → src/libcore/tests/cmp.rs b/src/libcoretest/cmp.rs → src/libcore/tests/cmp.rs
diff --git a/src/libcoretest/fmt/builders.rs → src/libcore/tests/fmt/builders.rs b/src/libcoretest/fmt/builders.rs → src/libcore/tests/fmt/builders.rs
diff --git a/src/libcoretest/fmt/float.rs → src/libcore/tests/fmt/float.rs b/src/libcoretest/fmt/float.rs → src/libcore/tests/fmt/float.rs
diff --git a/src/libcoretest/fmt/mod.rs → src/libcore/tests/fmt/mod.rs b/src/libcoretest/fmt/mod.rs → src/libcore/tests/fmt/mod.rs
diff --git a/src/libcoretest/fmt/num.rs → src/libcore/tests/fmt/num.rs b/src/libcoretest/fmt/num.rs → src/libcore/tests/fmt/num.rs
diff --git a/src/libcoretest/hash/mod.rs → src/libcore/tests/hash/mod.rs b/src/libcoretest/hash/mod.rs → src/libcore/tests/hash/mod.rs
diff --git a/src/libcoretest/hash/sip.rs → src/libcore/tests/hash/sip.rs b/src/libcoretest/hash/sip.rs → src/libcore/tests/hash/sip.rs
diff --git a/src/libcoretest/intrinsics.rs → src/libcore/tests/intrinsics.rs b/src/libcoretest/intrinsics.rs → src/libcore/tests/intrinsics.rs
diff --git a/src/libcoretest/iter.rs → src/libcore/tests/iter.rs b/src/libcoretest/iter.rs → src/libcore/tests/iter.rs
diff --git a/src/libcoretest/lib.rs → src/libcore/tests/lib.rs b/src/libcoretest/lib.rs → src/libcore/tests/lib.rs
diff --git a/src/libcoretest/mem.rs → src/libcore/tests/mem.rs b/src/libcoretest/mem.rs → src/libcore/tests/mem.rs
diff --git a/src/libcoretest/nonzero.rs → src/libcore/tests/nonzero.rs b/src/libcoretest/nonzero.rs → src/libcore/tests/nonzero.rs
diff --git a/src/libcoretest/num/bignum.rs → src/libcore/tests/num/bignum.rs b/src/libcoretest/num/bignum.rs → src/libcore/tests/num/bignum.rs
diff --git a/src/libcoretest/num/dec2flt/mod.rs → src/libcore/tests/num/dec2flt/mod.rs b/src/libcoretest/num/dec2flt/mod.rs → src/libcore/tests/num/dec2flt/mod.rs
diff --git a/src/libcoretest/num/dec2flt/parse.rs → src/libcore/tests/num/dec2flt/parse.rs b/src/libcoretest/num/dec2flt/parse.rs → src/libcore/tests/num/dec2flt/parse.rs
diff --git a/src/libcoretest/num/dec2flt/rawfp.rs → src/libcore/tests/num/dec2flt/rawfp.rs b/src/libcoretest/num/dec2flt/rawfp.rs → src/libcore/tests/num/dec2flt/rawfp.rs
diff --git a/src/libcoretest/num/flt2dec/estimator.rs → src/libcore/tests/num/flt2dec/estimator.rs b/src/libcoretest/num/flt2dec/estimator.rs → src/libcore/tests/num/flt2dec/estimator.rs
diff --git a/src/libcoretest/num/flt2dec/mod.rs → src/libcore/tests/num/flt2dec/mod.rs b/src/libcoretest/num/flt2dec/mod.rs → src/libcore/tests/num/flt2dec/mod.rs
diff --git a/...ibcoretest/num/flt2dec/strategy/dragon.rs → ...core/tests/num/flt2dec/strategy/dragon.rs b/...ibcoretest/num/flt2dec/strategy/dragon.rs → ...core/tests/num/flt2dec/strategy/dragon.rs
diff --git a/...libcoretest/num/flt2dec/strategy/grisu.rs → ...bcore/tests/num/flt2dec/strategy/grisu.rs b/...libcoretest/num/flt2dec/strategy/grisu.rs → ...bcore/tests/num/flt2dec/strategy/grisu.rs
diff --git a/src/libcoretest/num/i16.rs → src/libcore/tests/num/i16.rs b/src/libcoretest/num/i16.rs → src/libcore/tests/num/i16.rs
diff --git a/src/libcoretest/num/i32.rs → src/libcore/tests/num/i32.rs b/src/libcoretest/num/i32.rs → src/libcore/tests/num/i32.rs
diff --git a/src/libcoretest/num/i64.rs → src/libcore/tests/num/i64.rs b/src/libcoretest/num/i64.rs → src/libcore/tests/num/i64.rs
diff --git a/src/libcoretest/num/i8.rs → src/libcore/tests/num/i8.rs b/src/libcoretest/num/i8.rs → src/libcore/tests/num/i8.rs
diff --git a/src/libcoretest/num/int_macros.rs → src/libcore/tests/num/int_macros.rs b/src/libcoretest/num/int_macros.rs → src/libcore/tests/num/int_macros.rs
diff --git a/src/libcoretest/num/mod.rs → src/libcore/tests/num/mod.rs b/src/libcoretest/num/mod.rs → src/libcore/tests/num/mod.rs
diff --git a/src/libcoretest/num/u16.rs → src/libcore/tests/num/u16.rs b/src/libcoretest/num/u16.rs → src/libcore/tests/num/u16.rs
diff --git a/src/libcoretest/num/u32.rs → src/libcore/tests/num/u32.rs b/src/libcoretest/num/u32.rs → src/libcore/tests/num/u32.rs
diff --git a/src/libcoretest/num/u64.rs → src/libcore/tests/num/u64.rs b/src/libcoretest/num/u64.rs → src/libcore/tests/num/u64.rs
diff --git a/src/libcoretest/num/u8.rs → src/libcore/tests/num/u8.rs b/src/libcoretest/num/u8.rs → src/libcore/tests/num/u8.rs
diff --git a/src/libcoretest/num/uint_macros.rs → src/libcore/tests/num/uint_macros.rs b/src/libcoretest/num/uint_macros.rs → src/libcore/tests/num/uint_macros.rs
diff --git a/src/libcoretest/ops.rs → src/libcore/tests/ops.rs b/src/libcoretest/ops.rs → src/libcore/tests/ops.rs
diff --git a/src/libcoretest/option.rs → src/libcore/tests/option.rs b/src/libcoretest/option.rs → src/libcore/tests/option.rs
diff --git a/src/libcoretest/ptr.rs → src/libcore/tests/ptr.rs b/src/libcoretest/ptr.rs → src/libcore/tests/ptr.rs
diff --git a/src/libcoretest/result.rs → src/libcore/tests/result.rs b/src/libcoretest/result.rs → src/libcore/tests/result.rs
diff --git a/src/libcoretest/slice.rs → src/libcore/tests/slice.rs b/src/libcoretest/slice.rs → src/libcore/tests/slice.rs
diff --git a/src/libcoretest/str.rs → src/libcore/tests/str.rs b/src/libcoretest/str.rs → 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 → src/libcore/tests/tuple.rs b/src/libcoretest/tuple.rs → src/libcore/tests/tuple.rs
diff --git 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",