Merging upstream version 1.68.2+dfsg1.

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

5 files changed, 0 insertions, 160 deletions

diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs
deleted file mode 100644
index cb2b585ab..000000000
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-#![crate_type = "rlib"]
-
-#[non_exhaustive]
-pub enum NonExhaustiveEnum {
-    Unit,
-    Tuple(u32),
-    Struct { field: u32 },
-}
-
-#[non_exhaustive]
-pub enum NestedNonExhaustive {
-    A(NonExhaustiveEnum),
-    B,
-    C,
-}
-
-#[non_exhaustive]
-pub enum EmptyNonExhaustiveEnum {}
-
-pub enum VariantNonExhaustive {
-    #[non_exhaustive]
-    Bar {
-        x: u32,
-        y: u64,
-    },
-    Baz(u32, u16),
-}
-
-#[non_exhaustive]
-pub enum NonExhaustiveSingleVariant {
-    A(bool),
-}
-
-#[repr(u8)]
-pub enum FieldLessWithNonExhaustiveVariant {
-    A,
-    B,
-    #[non_exhaustive]
-    C,
-}
-
-impl Default for FieldLessWithNonExhaustiveVariant {
-    fn default() -> Self { Self::A }
-}
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
deleted file mode 100644
index 5f86db86d..000000000
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#[non_exhaustive]
-pub enum NonExhaustiveMonovariant {
-    Variant(u32),
-}
-
-pub enum ExhaustiveMonovariant {
-    Variant(u32),
-}
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs
deleted file mode 100644
index 78db6b170..000000000
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-#[derive(Default)]
-#[non_exhaustive]
-pub struct NormalStruct {
-    pub first_field: u16,
-    pub second_field: u16,
-}
-
-#[non_exhaustive]
-pub struct UnitStruct;
-
-#[non_exhaustive]
-pub struct TupleStruct(pub u16, pub u16);
-
-#[derive(Debug)]
-#[non_exhaustive]
-pub struct FunctionalRecord {
-    pub first_field: u16,
-    pub second_field: u16,
-    pub third_field: bool,
-}
-
-impl Default for FunctionalRecord {
-    fn default() -> FunctionalRecord {
-        FunctionalRecord { first_field: 640, second_field: 480, third_field: false }
-    }
-}
-
-#[derive(Default)]
-#[non_exhaustive]
-pub struct NestedStruct {
-    pub foo: u16,
-    pub bar: NormalStruct,
-}
-
-#[derive(Default)]
-#[non_exhaustive]
-pub struct MixedVisFields {
-    pub a: u16,
-    pub b: bool,
-    pub(crate) foo: bool,
-}
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs
deleted file mode 100644
index 11df44461..000000000
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-#![feature(staged_api)]
-#![stable(feature = "stable_test_feature", since = "1.0.0")]
-
-#[stable(feature = "stable_test_feature", since = "1.0.0")]
-#[non_exhaustive]
-pub enum UnstableEnum {
-    #[stable(feature = "stable_test_feature", since = "1.0.0")]
-    Stable,
-    #[stable(feature = "stable_test_feature", since = "1.0.0")]
-    Stable2,
-    #[unstable(feature = "unstable_test_feature", issue = "none")]
-    Unstable,
-}
-
-#[stable(feature = "stable_test_feature", since = "1.0.0")]
-#[non_exhaustive]
-pub enum OnlyUnstableEnum {
-    #[unstable(feature = "unstable_test_feature", issue = "none")]
-    Unstable,
-    #[unstable(feature = "unstable_test_feature", issue = "none")]
-    Unstable2,
-}
-
-impl OnlyUnstableEnum {
-    #[stable(feature = "stable_test_feature", since = "1.0.0")]
-    pub fn new() -> Self {
-        Self::Unstable
-    }
-}
-
-#[derive(Default)]
-#[stable(feature = "stable_test_feature", since = "1.0.0")]
-#[non_exhaustive]
-pub struct UnstableStruct {
-    #[stable(feature = "stable_test_feature", since = "1.0.0")]
-    pub stable: bool,
-    #[stable(feature = "stable_test_feature", since = "1.0.0")]
-    pub stable2: usize,
-    #[unstable(feature = "unstable_test_feature", issue = "none")]
-    pub unstable: u8,
-}
-
-#[stable(feature = "stable_test_feature", since = "1.0.0")]
-#[non_exhaustive]
-pub struct OnlyUnstableStruct {
-    #[unstable(feature = "unstable_test_feature", issue = "none")]
-    pub unstable: u8,
-    #[unstable(feature = "unstable_test_feature", issue = "none")]
-    pub unstable2: bool,
-}
-
-impl OnlyUnstableStruct {
-    #[stable(feature = "stable_test_feature", since = "1.0.0")]
-    pub fn new() -> Self {
-        Self {
-            unstable: 0,
-            unstable2: false,
-        }
-    }
-}
diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs
deleted file mode 100644
index 02672d545..000000000
--- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![crate_type = "rlib"]
-
-pub enum NonExhaustiveVariants {
-    #[non_exhaustive] Unit,
-    #[non_exhaustive] Tuple(u32),
-    #[non_exhaustive] Struct { field: u32 }
-}