Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/statics/uninhabited-static.rs b/src/test/ui/statics/uninhabited-static.rs
deleted file mode 100644
index f5c6f4443..000000000
--- a/src/test/ui/statics/uninhabited-static.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-#![feature(never_type)]
-#![deny(uninhabited_static)]
-
-enum Void {}
-extern {
-    static VOID: Void; //~ ERROR static of uninhabited type
-    //~| WARN: previously accepted
-    static NEVER: !; //~ ERROR static of uninhabited type
-    //~| WARN: previously accepted
-}
-
-static VOID2: Void = unsafe { std::mem::transmute(()) }; //~ ERROR static of uninhabited type
-//~| WARN: previously accepted
-//~| ERROR could not evaluate static initializer
-//~| WARN: type `Void` does not permit zero-initialization
-static NEVER2: Void = unsafe { std::mem::transmute(()) }; //~ ERROR static of uninhabited type
-//~| WARN: previously accepted
-//~| ERROR could not evaluate static initializer
-//~| WARN: type `Void` does not permit zero-initialization
-
-fn main() {}