Stabilize const TypeId::of and type_name

Author: oli-obk

compiler/rustc_mir_transform/src/lib.rs

@@ -1,8 +1,8 @@
 // tidy-alphabetical-start
+#![cfg_attr(bootstrap, feature(const_type_name))]
 #![feature(array_windows)]
 #![feature(assert_matches)]
 #![feature(box_patterns)]
-#![feature(const_type_name)]
 #![feature(cow_is_borrowed)]
 #![feature(file_buffered)]
 #![feature(if_let_guard)]

library/core/src/any.rs

@@ -725,7 +725,7 @@ unsafe impl Send for TypeId {}
 unsafe impl Sync for TypeId {}
 
 #[stable(feature = "rust1", since = "1.0.0")]
-#[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
+#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]
 impl const PartialEq for TypeId {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
@@ -773,7 +773,7 @@ impl TypeId {
     /// ```
     #[must_use]
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
+    #[rustc_const_stable(feature = "const_type_id", since = "CURRENT_RUSTC_VERSION")]
     pub const fn of<T: ?Sized + 'static>() -> TypeId {
         const { intrinsics::type_id::<T>() }
     }
@@ -852,7 +852,7 @@ impl fmt::Debug for TypeId {
 /// ```
 #[must_use]
 #[stable(feature = "type_name", since = "1.38.0")]
-#[rustc_const_unstable(feature = "const_type_name", issue = "63084")]
+#[rustc_const_stable(feature = "const_type_name", since = "CURRENT_RUSTC_VERSION")]
 pub const fn type_name<T: ?Sized>() -> &'static str {
     const { intrinsics::type_name::<T>() }
 }
@@ -892,7 +892,7 @@ pub const fn type_name<T: ?Sized>() -> &'static str {
 /// ```
 #[must_use]
 #[stable(feature = "type_name_of_val", since = "1.76.0")]
-#[rustc_const_unstable(feature = "const_type_name", issue = "63084")]
+#[rustc_const_stable(feature = "const_type_name", since = "CURRENT_RUSTC_VERSION")]
 pub const fn type_name_of_val<T: ?Sized>(_val: &T) -> &'static str {
     type_name::<T>()
 }

tests/mir-opt/gvn_const_eval_polymorphic.rs

@@ -10,8 +10,6 @@
 //! evaluated to the string "crate_name::generic::<T>", and
 //! `no_optimize` was incorrectly optimized to `false`.
 
-#![feature(const_type_name)]
-
 fn generic<T>() {}
 
 const fn type_name_contains_i32<T>(_: &T) -> bool {

tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr

@@ -1,5 +1,5 @@
 error: generic parameters may not be used in const operations
-  --> $DIR/intrinsics-type_name-as-const-argument.rs:14:45
+  --> $DIR/intrinsics-type_name-as-const-argument.rs:13:45
    |
 LL |     T: Trait<{ std::intrinsics::type_name::<T>() }>,
    |                                             ^ cannot perform const operation using `T`
@@ -8,7 +8,7 @@ LL |     T: Trait<{ std::intrinsics::type_name::<T>() }>,
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
 
 error: `&'static str` is forbidden as the type of a const generic parameter
-  --> $DIR/intrinsics-type_name-as-const-argument.rs:9:22
+  --> $DIR/intrinsics-type_name-as-const-argument.rs:8:22
    |
 LL | trait Trait<const S: &'static str> {}
    |                      ^^^^^^^^^^^^

tests/ui/const-generics/intrinsics-type_name-as-const-argument.rs

@@ -4,7 +4,6 @@
 #![cfg_attr(full, allow(incomplete_features))]
 #![cfg_attr(full, feature(adt_const_params, unsized_const_params, generic_const_exprs))]
 #![feature(core_intrinsics)]
-#![feature(const_type_name)]
 
 trait Trait<const S: &'static str> {}
 //[min]~^ ERROR `&'static str` is forbidden as the type of a const generic parameter

tests/ui/const-generics/issues/issue-90318.rs

@@ -1,4 +1,3 @@
-#![feature(const_type_id)]
 #![feature(generic_const_exprs)]
 #![feature(const_trait_impl, const_cmp)]
 #![feature(core_intrinsics)]

tests/ui/const-generics/issues/issue-90318.stderr

@@ -1,5 +1,5 @@
 error: overly complex generic constant
-  --> $DIR/issue-90318.rs:15:8
+  --> $DIR/issue-90318.rs:14:8
    |
 LL |     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
    |        ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL |     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
    = note: this operation may be supported in the future
 
 error: overly complex generic constant
-  --> $DIR/issue-90318.rs:22:8
+  --> $DIR/issue-90318.rs:21:8
    |
 LL |     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
    |        ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/consts/const-fn-type-name-any.rs

@@ -1,6 +1,5 @@
 //@ run-pass
 
-#![feature(const_type_name)]
 #![allow(dead_code)]
 
 const fn type_name_wrapper<T>(_: &T) -> &'static str {

tests/ui/consts/const-fn-type-name.rs

@@ -1,7 +1,6 @@
 //@ run-pass
 
 #![feature(core_intrinsics)]
-#![feature(const_type_name)]
 #![allow(dead_code)]
 
 const fn type_name_wrapper<T>(_: &T) -> &'static str {

tests/ui/consts/const-typeid-of-rpass.rs

@@ -1,6 +1,4 @@
 //@ run-pass
-#![feature(const_type_id)]
-#![feature(core_intrinsics)]
 
 use std::any::TypeId;