Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 13 deletions

diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs
deleted file mode 100644
index 62355cc2d..000000000
--- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file was auto-generated using 'src/etc/generate-deriving-span-tests.py'
-
-#[derive(Eq,PartialOrd,PartialEq)]
-struct Error;
-
-#[derive(Ord,Eq,PartialOrd,PartialEq)]
-enum Enum {
-   A {
-     x: Error //~ ERROR
-   }
-}
-
-fn main() {}