Move tests to library/core/tests

diff --git a/library/core/tests/convert.rs b/library/core/tests/convert.rs
new file mode 100644 (file)
index 0000000..f1048f4
--- /dev/null
+++ b/library/core/tests/convert.rs
@@ -0,0 +1,16 @@
+#[test]
+fn convert() {
+    const fn from(x: i32) -> i32 {
+        i32::from(x)
+    }
+
+    const FOO: i32 = from(42);
+    assert_eq!(FOO, 42);
+
+    const fn into(x: Vec<String>) -> Vec<String> {
+        x.into()
+    }
+
+    const BAR: Vec<String> = into(Vec::new());
+    assert_eq!(BAR, Vec::<String>::new());
+}

diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index 19bcc45108dfd5225761723e0c6b7bb64fbb0eaa..cc9d70cfbdcd3b9dfdabf6ee02700dcc0f8c670f 100644 (file)
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -9,12 +9,13 @@
 #![feature(cfg_target_has_atomic)]
 #![feature(const_assume)]
 #![feature(const_cell_into_inner)]
+#![feature(const_convert)]
 #![feature(const_maybe_uninit_assume_init)]
+#![feature(const_num_from_num)]
 #![feature(const_ptr_read)]
 #![feature(const_ptr_write)]
 #![feature(const_ptr_offset)]
 #![feature(const_trait_impl)]
-#![feature(const_num_from_num)]
 #![feature(core_intrinsics)]
 #![feature(core_private_bignum)]
 #![feature(core_private_diy_float)]
@@ -84,6 +85,7 @@
 mod clone;
 mod cmp;
 mod const_ptr;
+mod convert;
 mod fmt;
 mod hash;
 mod intrinsics;

diff --git a/src/test/ui/consts/convert.rs b/src/test/ui/consts/convert.rs
deleted file mode 100644 (file)
index e103740..0000000
--- a/src/test/ui/consts/convert.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-pass
-
-#![feature(const_trait_impl)]
-#![feature(const_identity_convert)]
-
-fn main() {
-    const fn from(x: i32) -> i32 {
-        i32::from(x)
-    }
-
-    const FOO: i32 = from(42);
-    assert_eq!(FOO, 42);
-
-    const fn into(x: Vec<String>) -> Vec<String> {
-        x.into()
-    }
-
-    const BAR: Vec<String> = into(Vec::new());
-    assert_eq!(BAR, Vec::<String>::new());
-}