Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/ui-fulldeps/deriving-global.rs b/src/test/ui-fulldeps/deriving-global.rs
deleted file mode 100644
index 921767af9..000000000
--- a/src/test/ui-fulldeps/deriving-global.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// run-pass
-
-#![feature(rustc_private)]
-
-extern crate rustc_macros;
-extern crate rustc_serialize;
-
-mod submod {
-    use rustc_macros::{Decodable, Encodable};
-
-    // if any of these are implemented without global calls for any
-    // function calls, then being in a submodule will (correctly)
-    // cause errors about unrecognised module `std` (or `extra`)
-    #[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone, Debug, Encodable, Decodable)]
-    enum A {
-        A1(usize),
-        A2(isize),
-    }
-
-    #[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone, Debug, Encodable, Decodable)]
-    struct B {
-        x: usize,
-        y: isize,
-    }
-
-    #[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone, Debug, Encodable, Decodable)]
-    struct C(usize, isize);
-}
-
-pub fn main() {}