Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 32 deletions

diff --git a/src/test/ui/impl-trait/nested-return-type2-tait2.rs b/src/test/ui/impl-trait/nested-return-type2-tait2.rs
deleted file mode 100644
index af8e06630..000000000
--- a/src/test/ui/impl-trait/nested-return-type2-tait2.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-#![feature(type_alias_impl_trait)]
-
-trait Duh {}
-
-impl Duh for i32 {}
-
-trait Trait {
-    type Assoc: Duh;
-}
-
-// the fact that `R` is the `::Output` projection on `F` causes
-// an intermediate inference var to be generated which is then later
-// compared against the actually found `Assoc` type.
-impl<R: Duh, F: FnMut() -> R> Trait for F {
-    type Assoc = R;
-}
-
-type Sendable = impl Send;
-type Traitable = impl Trait<Assoc = Sendable>;
-
-// The `impl Send` here is then later compared against the inference var
-// created, causing the inference var to be set to `impl Send` instead of
-// the hidden type. We already have obligations registered on the inference
-// var to make it uphold the `: Duh` bound on `Trait::Assoc`. The opaque
-// type does not implement `Duh`, even if its hidden type does. So we error out.
-fn foo() -> Traitable {
-    || 42
-    //~^ ERROR `Sendable: Duh` is not satisfied
-}
-
-fn main() {
-}