Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 43 deletions

diff --git a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.fixed b/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.fixed
deleted file mode 100644
index 8ef7e34ab..000000000
--- a/src/test/ui/suggestions/trait-with-missing-associated-type-restriction-fixable.fixed
+++ /dev/null
@@ -1,43 +0,0 @@
-// run-rustfix
-#![allow(unused)] // for the fixed file
-
-trait Trait<T = Self> {
-    type A;
-
-    fn func(&self) -> Self::A;
-}
-
-struct S<T>(T);
-impl<K> S<K> {
-    fn foo<'a, T: Trait + 'a>(&self, _: impl Trait, x: impl Trait<A = usize>, _: T) {
-        qux(x.func()) //~ ERROR mismatched types
-    }
-
-    fn ban<T>(x: T) where T: Trait<A = usize> {
-        qux(x.func()) //~ ERROR mismatched types
-    }
-}
-
-fn foo<'a, T: Trait + 'a>(_: impl Trait, x: impl Trait<A = usize>, _: T) {
-    qux(x.func()) //~ ERROR mismatched types
-}
-
-fn bar<T: Trait<A = usize>>(x: T) {
-    qux(x.func()) //~ ERROR mismatched types
-}
-
-fn foo2(x: impl Trait<i32, A = usize>) {
-    qux(x.func()) //~ ERROR mismatched types
-}
-
-fn bar2<T: Trait<i32, A = usize>>(x: T) {
-    qux(x.func()) //~ ERROR mismatched types
-}
-
-fn ban<T>(x: T) where T: Trait<A = usize> {
-    qux(x.func()) //~ ERROR mismatched types
-}
-
-fn qux(_: usize) {}
-
-fn main() {}