Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 23 deletions

diff --git a/src/test/ui/associated-types/associated-types-bound-ambiguity.rs b/src/test/ui/associated-types/associated-types-bound-ambiguity.rs
deleted file mode 100644
index 9f179b645..000000000
--- a/src/test/ui/associated-types/associated-types-bound-ambiguity.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Make sure that if there are multiple applicable bounds on a projection, we
-// consider them ambiguous. In this test we are initially trying to solve
-// `Self::Repr: From<_>`, which is ambiguous until we later infer `_` to
-// `{integer}`.
-
-// check-pass
-
-trait PrimeField: Sized {
-    type Repr: From<u64> + From<Self>;
-    type Repr2: From<Self> + From<u64>;
-
-    fn method() {
-        Self::Repr::from(10);
-        Self::Repr2::from(10);
-    }
-}
-
-fn function<T: PrimeField>() {
-    T::Repr::from(10);
-    T::Repr2::from(10);
-}
-
-fn main() {}