diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-07-30 22:43:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 22:43:37 +0200 |
| commit | c088890b6e9f813b47bbe41e4eae9cd3545cb1d2 (patch) | |
| tree | fa25e3f6ebbf2bcc42eb526de59765dc9391e54f /src | |
| parent | cdf97589df2de0d5e877dac43d0ec6089c20fb11 (diff) | |
| parent | 4a3d41d334860f18a7fc9319167f9e275dd9510b (diff) | |
| download | rust-c088890b6e9f813b47bbe41e4eae9cd3545cb1d2.tar.gz rust-c088890b6e9f813b47bbe41e4eae9cd3545cb1d2.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/any.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/consts/const-fn-type-name-any.rs | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/src/libcore/any.rs b/src/libcore/any.rs index f7aef66942d..078091a9b54 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -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>() diff --git a/src/test/ui/consts/const-fn-type-name-any.rs b/src/test/ui/consts/const-fn-type-name-any.rs new file mode 100644 index 00000000000..4ccfb420984 --- /dev/null +++ b/src/test/ui/consts/const-fn-type-name-any.rs @@ -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); +} |
