Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 0 insertions, 35 deletions

diff --git a/src/test/ui/traits/bound/auxiliary/crate_a1.rs b/src/test/ui/traits/bound/auxiliary/crate_a1.rs
deleted file mode 100644
index 6aa010258..000000000
--- a/src/test/ui/traits/bound/auxiliary/crate_a1.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub trait Bar {}
-
-pub fn try_foo(x: impl Bar) {}
-
-pub struct ImplementsTraitForUsize<T> {
-    _marker: std::marker::PhantomData<T>,
-}
-
-impl Bar for ImplementsTraitForUsize<usize> {}
diff --git a/src/test/ui/traits/bound/auxiliary/crate_a2.rs b/src/test/ui/traits/bound/auxiliary/crate_a2.rs
deleted file mode 100644
index d6057db5e..000000000
--- a/src/test/ui/traits/bound/auxiliary/crate_a2.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub struct Foo;
-
-pub trait Bar {}
-
-impl Bar for Foo {}
-
-pub struct DoesNotImplementTrait;
-
-pub struct ImplementsWrongTraitConditionally<T> {
-    _marker: std::marker::PhantomData<T>,
-}
-
-impl Bar for ImplementsWrongTraitConditionally<isize> {}
diff --git a/src/test/ui/traits/bound/auxiliary/on_structs_and_enums_xc.rs b/src/test/ui/traits/bound/auxiliary/on_structs_and_enums_xc.rs
deleted file mode 100644
index 7e9592eee..000000000
--- a/src/test/ui/traits/bound/auxiliary/on_structs_and_enums_xc.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub trait Trait {
-    fn dummy(&self) { }
-}
-
-pub struct Foo<T:Trait> {
-    pub x: T,
-}
-
-pub enum Bar<T:Trait> {
-    ABar(isize),
-    BBar(T),
-    CBar(usize),
-}