about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorBastian Kauschke <bastian_kauschke@hotmail.de>2020-03-08 15:12:46 +0100
committerBastian Kauschke <bastian_kauschke@hotmail.de>2020-03-08 15:12:46 +0100
commit22f2385a738827fb682bc72bb9e1d794bb436672 (patch)
tree45457b92acabcc7ad39a1390c6de765e5d02ec35 /src
parent6d03bbd480ef9bef09321fbfdc00229a03091b11 (diff)
downloadrust-22f2385a738827fb682bc72bb9e1d794bb436672.tar.gz
rust-22f2385a738827fb682bc72bb9e1d794bb436672.zip
prevent potential promotion in const_discriminant
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/consts/const_discriminant.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/test/ui/consts/const_discriminant.rs b/src/test/ui/consts/const_discriminant.rs
index 5a32ff29158..564434bb6fa 100644
--- a/src/test/ui/consts/const_discriminant.rs
+++ b/src/test/ui/consts/const_discriminant.rs
@@ -3,6 +3,8 @@
 
 use std::mem::{discriminant, Discriminant};
 
+fn identity<T>(x: T) -> T { x }
+
 enum Test {
     A(u8),
     B,
@@ -15,8 +17,8 @@ const TEST_B: Discriminant<Test> = discriminant(&Test::B);
 
 fn main() {
     assert_eq!(TEST_A, TEST_A_OTHER);
-    assert_eq!(TEST_A, discriminant(&Test::A(17)));
-    assert_eq!(TEST_B, discriminant(&Test::B));
+    assert_eq!(TEST_A, discriminant(identity(&Test::A(17))));
+    assert_eq!(TEST_B, discriminant(identity(&Test::B)));
     assert_ne!(TEST_A, TEST_B);
-    assert_ne!(TEST_B, discriminant(&Test::C { a: 42, b: 7 }));
+    assert_ne!(TEST_B, discriminant(identity(&Test::C { a: 42, b: 7 })));
 }