Stabilize const TypeId::of and type_name

oli-obk · oli-obk · commit d94f60fea670 · 2025-07-18T13:57:43.000Z
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/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)]
diff --git a/library/core/src/any.rs b/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>()
 }
diff --git a/tests/mir-opt/gvn_const_eval_polymorphic.rs b/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 {
diff --git a/tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr b/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> {}
    |                      ^^^^^^^^^^^^
diff --git a/tests/ui/const-generics/intrinsics-type_name-as-const-argument.rs b/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
diff --git a/tests/ui/const-generics/issues/issue-90318.rs b/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)]
diff --git a/tests/ui/const-generics/issues/issue-90318.stderr b/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,
    |        ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/consts/const-fn-type-name-any.rs b/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 {
diff --git a/tests/ui/consts/const-fn-type-name.rs b/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 {
diff --git a/tests/ui/consts/const-typeid-of-rpass.rs b/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;
 
diff --git a/tests/ui/consts/const_cmp_type_id.rs b/tests/ui/consts/const_cmp_type_id.rs
@@ -1,5 +1,5 @@
 //@ compile-flags: -Znext-solver
-#![feature(const_type_id, const_trait_impl, const_cmp)]
+#![feature(const_trait_impl, const_cmp)]
 
 use std::any::TypeId;
 
diff --git a/tests/ui/consts/const_transmute_type_id.rs b/tests/ui/consts/const_transmute_type_id.rs
@@ -1,4 +1,4 @@
-#![feature(const_type_id, const_trait_impl, const_cmp)]
+#![feature(const_trait_impl, const_cmp)]
 
 use std::any::TypeId;
 
diff --git a/tests/ui/consts/const_transmute_type_id2.rs b/tests/ui/consts/const_transmute_type_id2.rs
@@ -1,6 +1,6 @@
 //@ normalize-stderr: "0x(ff)+" -> "<u128::MAX>"
 
-#![feature(const_type_id, const_trait_impl, const_cmp)]
+#![feature( const_trait_impl, const_cmp)]
 
 use std::any::TypeId;
 
diff --git a/tests/ui/consts/const_transmute_type_id3.rs b/tests/ui/consts/const_transmute_type_id3.rs
@@ -1,7 +1,7 @@
 //! Test that all bytes of a TypeId must have the
 //! TypeId marker provenance.
 
-#![feature(const_type_id, const_trait_impl, const_cmp)]
+#![feature( const_trait_impl, const_cmp)]
 
 use std::any::TypeId;
 
diff --git a/tests/ui/consts/const_transmute_type_id4.rs b/tests/ui/consts/const_transmute_type_id4.rs
@@ -1,4 +1,4 @@
-#![feature(const_type_id, const_trait_impl, const_cmp)]
+#![feature(const_trait_impl, const_cmp)]
 
 use std::any::TypeId;
 
diff --git a/tests/ui/consts/const_transmute_type_id5.rs b/tests/ui/consts/const_transmute_type_id5.rs
@@ -1,7 +1,7 @@
 //! Test that we require an equal TypeId to have an integer part that properly
 //! reflects the type id hash.
 
-#![feature(const_type_id, const_trait_impl, const_cmp)]
+#![feature(const_trait_impl, const_cmp)]
 
 use std::any::TypeId;
 
diff --git a/tests/ui/consts/issue-102117.rs b/tests/ui/consts/issue-102117.rs
@@ -1,5 +1,3 @@
-#![feature(const_type_id)]
-
 use std::alloc::Layout;
 use std::any::TypeId;
 use std::mem::transmute;
diff --git a/tests/ui/consts/issue-102117.stderr b/tests/ui/consts/issue-102117.stderr
@@ -1,5 +1,5 @@
 error[E0310]: the parameter type `T` may not live long enough
-  --> $DIR/issue-102117.rs:19:26
+  --> $DIR/issue-102117.rs:17:26
    |
 LL |                 type_id: TypeId::of::<T>(),
    |                          ^^^^^^^^^^^^^^^^^
@@ -13,7 +13,7 @@ LL |     pub fn new<T: 'static>() -> &'static Self {
    |                 +++++++++
 
 error[E0310]: the parameter type `T` may not live long enough
-  --> $DIR/issue-102117.rs:19:26
+  --> $DIR/issue-102117.rs:17:26
    |
 LL |                 type_id: TypeId::of::<T>(),
    |                          ^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/consts/issue-73976-monomorphic.rs b/tests/ui/consts/issue-73976-monomorphic.rs
@@ -5,8 +5,6 @@
 // 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)]
 #![feature(const_trait_impl)]
 #![feature(const_cmp)]
 
diff --git a/tests/ui/consts/issue-73976-polymorphic.rs b/tests/ui/consts/issue-73976-polymorphic.rs
@@ -5,9 +5,6 @@
 // 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};
 
 pub struct GetTypeId<T>(T);
diff --git a/tests/ui/consts/issue-73976-polymorphic.stderr b/tests/ui/consts/issue-73976-polymorphic.stderr
@@ -1,5 +1,5 @@
 error[E0158]: constant pattern cannot depend on generic parameters
-  --> $DIR/issue-73976-polymorphic.rs:20:37
+  --> $DIR/issue-73976-polymorphic.rs:17:37
    |
 LL | impl<T: 'static> GetTypeId<T> {
    | -----------------------------
@@ -12,7 +12,7 @@ LL |     matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE)
    |                                     ^^^^^^^^^^^^^^^^^^^^^ `const` depends on a generic parameter
 
 error[E0158]: constant pattern cannot depend on generic parameters
-  --> $DIR/issue-73976-polymorphic.rs:31:42
+  --> $DIR/issue-73976-polymorphic.rs:28:42
    |
 LL | impl<T: 'static> GetTypeNameLen<T> {
    | ----------------------------------

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: generic parameters may not be used in const operations`
`2`		`- --> $DIR/intrinsics-type_name-as-const-argument.rs:14:45`
	`2`	`+ --> $DIR/intrinsics-type_name-as-const-argument.rs:13:45`
`3`	`3`	`\|`
`4`	`4`	`LL \| T: Trait<{ std::intrinsics::type_name::<T>() }>,`
`5`	`5`	\| ^ cannot perform const operation using `T`
`@@ -8,7 +8,7 @@ LL \| T: Trait<{ std::intrinsics::type_name::<T>() }>,`
`8`	`8`	= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
`9`	`9`
`10`	`10`	error: `&'static str` is forbidden as the type of a const generic parameter
`11`		`- --> $DIR/intrinsics-type_name-as-const-argument.rs:9:22`
	`11`	`+ --> $DIR/intrinsics-type_name-as-const-argument.rs:8:22`
`12`	`12`	`\|`
`13`	`13`	`LL \| trait Trait<const S: &'static str> {}`
`14`	`14`	`\| ^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#![feature(const_type_id)]`
`2`	`1`	`#![feature(generic_const_exprs)]`
`3`	`2`	`#![feature(const_trait_impl, const_cmp)]`
`4`	`3`	`#![feature(core_intrinsics)]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: overly complex generic constant`
`2`		`- --> $DIR/issue-90318.rs:15:8`
	`2`	`+ --> $DIR/issue-90318.rs:14:8`
`3`	`3`	`\|`
`4`	`4`	`LL \| If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,`
`5`	`5`	`\| ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -10,7 +10,7 @@ LL \| If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,`
`10`	`10`	`= note: this operation may be supported in the future`
`11`	`11`
`12`	`12`	`error: overly complex generic constant`
`13`		`- --> $DIR/issue-90318.rs:22:8`
	`13`	`+ --> $DIR/issue-90318.rs:21:8`
`14`	`14`	`\|`
`15`	`15`	`LL \| If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,`
`16`	`16`	`\| ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^`