Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 16 deletions

diff --git a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.rs b/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.rs
deleted file mode 100644
index ad9fcc25b..000000000
--- a/src/test/ui/enum-discriminant/issue-70453-generics-in-discr-ice-2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![feature(core_intrinsics)]
-
-extern crate core;
-use core::intrinsics::discriminant_value;
-
-#[repr(usize)]
-enum MyWeirdOption<T> {
-    None = 0,
-    Some(T) = std::mem::size_of::<T>(),
-    //~^ ERROR generic parameters may not be used in const operations
-}
-
-fn main() {
-    assert_eq!(discriminant_value(&MyWeirdOption::<u8>::None), 0);
-    assert_eq!(discriminant_value(&MyWeirdOption::Some(0u8)), 1);
-}