From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/sized/coinductive-1-gat.rs    | 14 --------------
 src/test/ui/sized/coinductive-1.rs        | 14 --------------
 src/test/ui/sized/coinductive-2.rs        | 28 ----------------------------
 src/test/ui/sized/recursive-type-1.rs     | 10 ----------
 src/test/ui/sized/recursive-type-2.rs     | 13 -------------
 src/test/ui/sized/recursive-type-2.stderr | 13 -------------
 6 files changed, 92 deletions(-)
 delete mode 100644 src/test/ui/sized/coinductive-1-gat.rs
 delete mode 100644 src/test/ui/sized/coinductive-1.rs
 delete mode 100644 src/test/ui/sized/coinductive-2.rs
 delete mode 100644 src/test/ui/sized/recursive-type-1.rs
 delete mode 100644 src/test/ui/sized/recursive-type-2.rs
 delete mode 100644 src/test/ui/sized/recursive-type-2.stderr

(limited to 'src/test/ui/sized')

diff --git a/src/test/ui/sized/coinductive-1-gat.rs b/src/test/ui/sized/coinductive-1-gat.rs
deleted file mode 100644
index cdf70920f..000000000
--- a/src/test/ui/sized/coinductive-1-gat.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// check-pass
-struct Node<C: Trait>(C::Assoc::<Self>);
-
-trait Trait {
-    type Assoc<T>;
-}
-
-impl Trait for Vec<()> {
-    type Assoc<T> = Vec<T>;
-}
-
-fn main() {
-    let _ = Node::<Vec<()>>(Vec::new());
-}
diff --git a/src/test/ui/sized/coinductive-1.rs b/src/test/ui/sized/coinductive-1.rs
deleted file mode 100644
index 7bcd0f1fd..000000000
--- a/src/test/ui/sized/coinductive-1.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// check-pass
-struct Node<C: Trait<Self>>(C::Assoc);
-
-trait Trait<T> {
-    type Assoc;
-}
-
-impl<T> Trait<T> for Vec<()> {
-    type Assoc = Vec<T>;
-}
-
-fn main() {
-    let _ = Node::<Vec<()>>(Vec::new());
-}
diff --git a/src/test/ui/sized/coinductive-2.rs b/src/test/ui/sized/coinductive-2.rs
deleted file mode 100644
index 212274d2e..000000000
--- a/src/test/ui/sized/coinductive-2.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// run-pass
-struct Node<C: CollectionFactory<Self>> {
-    _children: C::Collection,
-}
-
-trait CollectionFactory<T> {
-    type Collection;
-}
-
-impl<T> CollectionFactory<T> for Vec<()> {
-    type Collection = Vec<T>;
-}
-
-trait Collection<T>: Sized {
-    fn push(&mut self, v: T);
-}
-
-impl<T> Collection<T> for Vec<T> {
-    fn push(&mut self, v: T) {
-        self.push(v)
-    }
-}
-
-fn main() {
-    let _ = Node::<Vec<()>> {
-        _children: Vec::new(),
-    };
-}
diff --git a/src/test/ui/sized/recursive-type-1.rs b/src/test/ui/sized/recursive-type-1.rs
deleted file mode 100644
index cd6805967..000000000
--- a/src/test/ui/sized/recursive-type-1.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// check-pass
-trait A { type Assoc; }
-
-impl A for () {
-    // FIXME: it would be nice for this to at least cause a warning.
-    type Assoc = Foo<()>;
-}
-struct Foo<T: A>(T::Assoc);
-
-fn main() {}
diff --git a/src/test/ui/sized/recursive-type-2.rs b/src/test/ui/sized/recursive-type-2.rs
deleted file mode 100644
index 7d95417a6..000000000
--- a/src/test/ui/sized/recursive-type-2.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// build-fail
-//~^ ERROR cycle detected when computing layout of `Foo<()>`
-
-trait A { type Assoc: ?Sized; }
-
-impl A for () {
-    type Assoc = Foo<()>;
-}
-struct Foo<T: A>(T::Assoc);
-
-fn main() {
-    let x: Foo<()>;
-}
diff --git a/src/test/ui/sized/recursive-type-2.stderr b/src/test/ui/sized/recursive-type-2.stderr
deleted file mode 100644
index d0e6e9db0..000000000
--- a/src/test/ui/sized/recursive-type-2.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0391]: cycle detected when computing layout of `Foo<()>`
-   |
-   = note: ...which requires computing layout of `<() as A>::Assoc`...
-   = note: ...which again requires computing layout of `Foo<()>`, completing the cycle
-note: cycle used when elaborating drops for `main`
-  --> $DIR/recursive-type-2.rs:11:1
-   |
-LL | fn main() {
-   | ^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0391`.
-- 
cgit v1.2.3