diff options
| author | Ashley Mannix <ashleymannix@live.com.au> | 2020-09-23 08:39:19 +1000 |
|---|---|---|
| committer | Ashley Mannix <ashleymannix@live.com.au> | 2020-09-23 09:40:51 +1000 |
| commit | 9b2c8d866ebe746207472ba5da7c1fd79c856faa (patch) | |
| tree | b0c50057c23cad0c32363f2245421cfd2a0f9bcc /src | |
| parent | e0bc267512fc0cb49c86978192857e8187017f0b (diff) | |
| download | rust-9b2c8d866ebe746207472ba5da7c1fd79c856faa.tar.gz rust-9b2c8d866ebe746207472ba5da7c1fd79c856faa.zip | |
revert const_type_id stabilization
This reverts commit e3856616ee2a894c7811a7017d98fafa7ba84dd8.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/consts/const-typeid-of-rpass.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/consts/issue-73976-monomorphic.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/consts/issue-73976-polymorphic.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/consts/issue-73976-polymorphic.stderr | 8 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/test/ui/consts/const-typeid-of-rpass.rs b/src/test/ui/consts/const-typeid-of-rpass.rs index c49141050b2..89d57ae4f98 100644 --- a/src/test/ui/consts/const-typeid-of-rpass.rs +++ b/src/test/ui/consts/const-typeid-of-rpass.rs @@ -1,4 +1,5 @@ // run-pass +#![feature(const_type_id)] #![feature(core_intrinsics)] use std::any::TypeId; diff --git a/src/test/ui/consts/issue-73976-monomorphic.rs b/src/test/ui/consts/issue-73976-monomorphic.rs index 1db0fdc87c3..7706a97f23b 100644 --- a/src/test/ui/consts/issue-73976-monomorphic.rs +++ b/src/test/ui/consts/issue-73976-monomorphic.rs @@ -5,6 +5,7 @@ // will be properly rejected. This test will ensure that monomorphic use of these // would not be wrongly rejected in patterns. +#![feature(const_type_id)] #![feature(const_type_name)] use std::any::{self, TypeId}; diff --git a/src/test/ui/consts/issue-73976-polymorphic.rs b/src/test/ui/consts/issue-73976-polymorphic.rs index b3d8610ff51..787462da9f9 100644 --- a/src/test/ui/consts/issue-73976-polymorphic.rs +++ b/src/test/ui/consts/issue-73976-polymorphic.rs @@ -5,6 +5,7 @@ // This test case should either run-pass or be rejected at compile time. // Currently we just disallow this usage and require pattern is monomorphic. +#![feature(const_type_id)] #![feature(const_type_name)] use std::any::{self, TypeId}; diff --git a/src/test/ui/consts/issue-73976-polymorphic.stderr b/src/test/ui/consts/issue-73976-polymorphic.stderr index 250f1536d85..442ad23f2cc 100644 --- a/src/test/ui/consts/issue-73976-polymorphic.stderr +++ b/src/test/ui/consts/issue-73976-polymorphic.stderr @@ -1,23 +1,23 @@ error: constant pattern depends on a generic parameter - --> $DIR/issue-73976-polymorphic.rs:19:37 + --> $DIR/issue-73976-polymorphic.rs:20:37 | LL | matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE) | ^^^^^^^^^^^^^^^^^^^^^ error: constant pattern depends on a generic parameter - --> $DIR/issue-73976-polymorphic.rs:31:42 + --> $DIR/issue-73976-polymorphic.rs:32:42 | LL | matches!(GetTypeNameLen::<T>::VALUE, GetTypeNameLen::<T>::VALUE) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: constant pattern depends on a generic parameter - --> $DIR/issue-73976-polymorphic.rs:19:37 + --> $DIR/issue-73976-polymorphic.rs:20:37 | LL | matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE) | ^^^^^^^^^^^^^^^^^^^^^ error: constant pattern depends on a generic parameter - --> $DIR/issue-73976-polymorphic.rs:31:42 + --> $DIR/issue-73976-polymorphic.rs:32:42 | LL | matches!(GetTypeNameLen::<T>::VALUE, GetTypeNameLen::<T>::VALUE) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ |