about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--library/core/tests/convert.rs (renamed from src/test/ui/consts/convert.rs)8
-rw-r--r--library/core/tests/lib.rs4
2 files changed, 5 insertions, 7 deletions
diff --git a/src/test/ui/consts/convert.rs b/library/core/tests/convert.rs
index e10374070ac..f1048f4cf09 100644
--- a/src/test/ui/consts/convert.rs
+++ b/library/core/tests/convert.rs
@@ -1,9 +1,5 @@
-// run-pass
-
-#![feature(const_trait_impl)]
-#![feature(const_identity_convert)]
-
-fn main() {
+#[test]
+fn convert() {
     const fn from(x: i32) -> i32 {
         i32::from(x)
     }
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index 19bcc45108d..cc9d70cfbdc 100644
--- 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 char;
 mod clone;
 mod cmp;
 mod const_ptr;
+mod convert;
 mod fmt;
 mod hash;
 mod intrinsics;