Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 0 insertions, 114 deletions

diff --git a/tests/ui/discrim/discrim-ill-typed.rs b/tests/ui/discrim/discrim-ill-typed.rs
deleted file mode 100644
index 3cf0ea0e6..000000000
--- a/tests/ui/discrim/discrim-ill-typed.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-// When explicit discriminant value has
-// a type that does not match the representation
-// type, rustc should fail gracefully.
-
-// See also run-pass/discrim-explicit-23030.rs where the input types
-// are correct.
-
-#![allow(dead_code, unused_variables, unused_imports)]
-
-fn f_i8() {
-    #[repr(i8)]
-    enum A {
-        Ok = i8::MAX - 1,
-        Ok2,
-        OhNo = 0_u8,
-        //~^ ERROR mismatched types
-        //~| expected `i8`, found `u8`
-    }
-
-    let x = A::Ok;
-}
-
-fn f_u8() {
-    #[repr(u8)]
-    enum A {
-        Ok = u8::MAX - 1,
-        Ok2,
-        OhNo = 0_i8,
-        //~^ ERROR mismatched types
-        //~| expected `u8`, found `i8`
-    }
-
-    let x = A::Ok;
-}
-
-fn f_i16() {
-    #[repr(i16)]
-    enum A {
-        Ok = i16::MAX - 1,
-        Ok2,
-        OhNo = 0_u16,
-        //~^ ERROR mismatched types
-        //~| expected `i16`, found `u16`
-    }
-
-    let x = A::Ok;
-}
-
-fn f_u16() {
-    #[repr(u16)]
-    enum A {
-        Ok = u16::MAX - 1,
-        Ok2,
-        OhNo = 0_i16,
-        //~^ ERROR mismatched types
-        //~| expected `u16`, found `i16`
-    }
-
-    let x = A::Ok;
-}
-
-fn f_i32() {
-    #[repr(i32)]
-    enum A {
-        Ok = i32::MAX - 1,
-        Ok2,
-        OhNo = 0_u32,
-        //~^ ERROR mismatched types
-        //~| expected `i32`, found `u32`
-    }
-
-    let x = A::Ok;
-}
-
-fn f_u32() {
-    #[repr(u32)]
-    enum A {
-        Ok = u32::MAX - 1,
-        Ok2,
-        OhNo = 0_i32,
-        //~^ ERROR mismatched types
-        //~| expected `u32`, found `i32`
-    }
-
-    let x = A::Ok;
-}
-
-fn f_i64() {
-    #[repr(i64)]
-    enum A {
-        Ok = i64::MAX - 1,
-        Ok2,
-        OhNo = 0_u64,
-        //~^ ERROR mismatched types
-        //~| expected `i64`, found `u64`
-    }
-
-    let x = A::Ok;
-}
-
-fn f_u64() {
-    #[repr(u64)]
-    enum A {
-        Ok = u64::MAX - 1,
-        Ok2,
-        OhNo = 0_i64,
-        //~^ ERROR mismatched types
-        //~| expected `u64`, found `i64`
-    }
-
-    let x = A::Ok;
-}
-
-fn main() { }