diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-03-11 10:36:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 10:36:28 +0100 |
| commit | dfbbd5d6ead535de08ff8d10e320194ac7585457 (patch) | |
| tree | 152f1a34df4b39a12e134541f5ffc6eaaac212a2 /src/libcore/mem | |
| parent | 452c147fba6f15478b25ab24c9b3077a5b1ebfbc (diff) | |
| parent | 7b3e3ff39aa45103a6f8432466f8078970866142 (diff) | |
| download | rust-dfbbd5d6ead535de08ff8d10e320194ac7585457.tar.gz rust-dfbbd5d6ead535de08ff8d10e320194ac7585457.zip | |
Rollup merge of #69825 - lcnr:discriminant, r=oli-obk
make `mem::discriminant` const implements #69821, which could be used as a tracking issue for `const_discriminant`. Should this be added to the meta tracking issue #57563? @Lokathor
Diffstat (limited to 'src/libcore/mem')
| -rw-r--r-- | src/libcore/mem/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs index 8add875dcbe..7d9a8bcd05b 100644 --- a/src/libcore/mem/mod.rs +++ b/src/libcore/mem/mod.rs @@ -870,6 +870,7 @@ impl<T> fmt::Debug for Discriminant<T> { /// assert_ne!(mem::discriminant(&Foo::B(3)), mem::discriminant(&Foo::C(3))); /// ``` #[stable(feature = "discriminant_value", since = "1.21.0")] -pub fn discriminant<T>(v: &T) -> Discriminant<T> { +#[rustc_const_unstable(feature = "const_discriminant", issue = "69821")] +pub const fn discriminant<T>(v: &T) -> Discriminant<T> { Discriminant(intrinsics::discriminant_value(v), PhantomData) } |