Skip to content

Commit 6a77688

Browse files
committed
Auto merge of rust-lang#77083 - KodrAus:revert/const-type-id, r=RalfJung
revert const_type_id stabilization This reverts rust-lang#72488, which is currently on beta and scheduled to stabilize in `1.47.0`, based on rust-lang#75923 (comment) It turns out we might not be quite ready to stabilize `TypeId` in const contexts before having a chance to rework its internals. Since `TypeId` is a bit of an oddity we want to be careful about how those internals are currently being relied on while making changes. That will be easier to do without having to also consider compile-time contexts. r? `@eddyb`
2 parents 5867ca6 + a4578ec commit 6a77688

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

core/src/any.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ impl TypeId {
435435
/// assert_eq!(is_string(&"cookie monster".to_string()), true);
436436
/// ```
437437
#[stable(feature = "rust1", since = "1.0.0")]
438-
#[rustc_const_stable(feature = "const_type_id", since = "1.46.0")]
438+
#[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
439439
pub const fn of<T: ?Sized + 'static>() -> TypeId {
440440
TypeId { t: intrinsics::type_id::<T>() }
441441
}

core/src/intrinsics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ extern "rust-intrinsic" {
807807
/// crate it is invoked in.
808808
///
809809
/// The stabilized version of this intrinsic is [`crate::any::TypeId::of`].
810-
#[rustc_const_stable(feature = "const_type_id", since = "1.46.0")]
810+
#[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
811811
pub fn type_id<T: ?Sized + 'static>() -> u64;
812812

813813
/// A guard for unsafe functions that cannot ever be executed if `T` is uninhabited:

core/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
#![feature(const_slice_ptr_len)]
9393
#![feature(const_size_of_val)]
9494
#![feature(const_align_of_val)]
95+
#![feature(const_type_id)]
9596
#![feature(const_type_name)]
9697
#![feature(const_likely)]
9798
#![feature(const_unreachable_unchecked)]

0 commit comments

Comments
 (0)