about summary refs log tree commit diff
path: root/src/libcore/mem
diff options
context:
space:
mode:
authorBastian Kauschke <bastian_kauschke@hotmail.de>2020-03-08 14:24:32 +0100
committerBastian Kauschke <bastian_kauschke@hotmail.de>2020-03-08 14:24:32 +0100
commit6d03bbd480ef9bef09321fbfdc00229a03091b11 (patch)
treedcf7fd10df1455d72968a192223a3a73ce56d6ce /src/libcore/mem
parentf943349eafaa75a60c05b0c84dcdb771d0eae8c9 (diff)
downloadrust-6d03bbd480ef9bef09321fbfdc00229a03091b11.tar.gz
rust-6d03bbd480ef9bef09321fbfdc00229a03091b11.zip
constify `mem::discriminant`
Diffstat (limited to 'src/libcore/mem')
-rw-r--r--src/libcore/mem/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs
index 90144d11dc9..c23d0adab5c 100644
--- a/src/libcore/mem/mod.rs
+++ b/src/libcore/mem/mod.rs
@@ -864,6 +864,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)
 }