Rollup merge of #63123 - TankhouseAle:const-fn-type-name-any, r=oli-obk

`const fn`-ify `std::any::type_name` as laid out in #63084

A test, based on the one I added when I implemented support for the underlying `core::intrinsics::type_name` being allowed in `const fn` contexts, is included.
This commit is contained in:
Mazdak Farrokhzad 2019-07-30 22:43:37 +02:00 committed by GitHub
commit c088890b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions

View File

@ -468,7 +468,8 @@ impl TypeId {
/// The current implementation uses the same infrastructure as compiler
/// diagnostics and debuginfo, but this is not guaranteed.
#[stable(feature = "type_name", since = "1.38.0")]
pub fn type_name<T: ?Sized>() -> &'static str {
#[rustc_const_unstable(feature = "const_type_name")]
pub const fn type_name<T: ?Sized>() -> &'static str {
#[cfg(bootstrap)]
unsafe {
intrinsics::type_name::<T>()

View File

@ -0,0 +1,29 @@
// run-pass
#![feature(const_fn)]
#![feature(const_type_name)]
#![allow(dead_code)]
const fn type_name_wrapper<T>(_: &T) -> &'static str {
std::any::type_name::<T>()
}
struct Struct<TA, TB, TC> {
a: TA,
b: TB,
c: TC,
}
type StructInstantiation = Struct<i8, f64, bool>;
const CONST_STRUCT: StructInstantiation = StructInstantiation { a: 12, b: 13.7, c: false };
const CONST_STRUCT_NAME: &'static str = type_name_wrapper(&CONST_STRUCT);
fn main() {
let non_const_struct = StructInstantiation { a: 87, b: 65.99, c: true };
let non_const_struct_name = type_name_wrapper(&non_const_struct);
assert_eq!(CONST_STRUCT_NAME, non_const_struct_name);
}