about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAshley Mannix <ashleymannix@live.com.au>2020-05-23 15:17:19 +1000
committerAshley Mannix <ashleymannix@live.com.au>2020-07-28 13:30:29 +1000
commitcac16c9793ef78b16f1da948bb3cd55599591ffb (patch)
tree5e6dd86cca748f9d83cb84d4819adfdd348d128f /src
parentac48e62db85e6db4bbe026490381ab205f4a614d (diff)
downloadrust-cac16c9793ef78b16f1da948bb3cd55599591ffb.tar.gz
rust-cac16c9793ef78b16f1da948bb3cd55599591ffb.zip
stabilize const_type_id feature
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/consts/const-typeid-of-rpass.rs1
-rw-r--r--src/test/ui/consts/const-typeid-of.rs8
-rw-r--r--src/test/ui/consts/const-typeid-of.stderr10
3 files changed, 0 insertions, 19 deletions
diff --git a/src/test/ui/consts/const-typeid-of-rpass.rs b/src/test/ui/consts/const-typeid-of-rpass.rs
index 225acb60ac4..c49141050b2 100644
--- a/src/test/ui/consts/const-typeid-of-rpass.rs
+++ b/src/test/ui/consts/const-typeid-of-rpass.rs
@@ -1,6 +1,5 @@
 // run-pass
 #![feature(core_intrinsics)]
-#![feature(const_type_id)]
 
 use std::any::TypeId;
 
diff --git a/src/test/ui/consts/const-typeid-of.rs b/src/test/ui/consts/const-typeid-of.rs
deleted file mode 100644
index 3829c481da8..00000000000
--- a/src/test/ui/consts/const-typeid-of.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use std::any::TypeId;
-
-struct A;
-
-fn main() {
-    const A_ID: TypeId = TypeId::of::<A>();
-    //~^ ERROR `std::any::TypeId::of` is not yet stable as a const fn
-}
diff --git a/src/test/ui/consts/const-typeid-of.stderr b/src/test/ui/consts/const-typeid-of.stderr
deleted file mode 100644
index 05347fbc819..00000000000
--- a/src/test/ui/consts/const-typeid-of.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: `std::any::TypeId::of` is not yet stable as a const fn
-  --> $DIR/const-typeid-of.rs:6:26
-   |
-LL |     const A_ID: TypeId = TypeId::of::<A>();
-   |                          ^^^^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(const_type_id)]` to the crate attributes to enable
-
-error: aborting due to previous error
-