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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../inheritance/repeated-supertrait-ambig.stderr   | 65 ----------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr

(limited to 'src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr')

diff --git a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr b/src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr
deleted file mode 100644
index 656e0d0bf..000000000
--- a/src/test/ui/traits/inheritance/repeated-supertrait-ambig.stderr
+++ /dev/null
@@ -1,65 +0,0 @@
-error[E0277]: the trait bound `dyn CompareToInts: CompareTo<i32>` is not satisfied
-  --> $DIR/repeated-supertrait-ambig.rs:26:15
-   |
-LL |     c.same_as(22)
-   |       ------- ^^ the trait `CompareTo<i32>` is not implemented for `dyn CompareToInts`
-   |       |
-   |       required by a bound introduced by this call
-   |
-   = help: the following other types implement trait `CompareTo<T>`:
-             <i64 as CompareTo<i64>>
-             <i64 as CompareTo<u64>>
-
-error[E0277]: the trait bound `C: CompareTo<i32>` is not satisfied
-  --> $DIR/repeated-supertrait-ambig.rs:30:15
-   |
-LL |     c.same_as(22)
-   |       ------- ^^ the trait `CompareTo<i32>` is not implemented for `C`
-   |       |
-   |       required by a bound introduced by this call
-   |
-help: consider further restricting this bound
-   |
-LL | fn with_trait<C:CompareToInts + CompareTo<i32>>(c: &C) -> bool {
-   |                               ++++++++++++++++
-
-error[E0277]: the trait bound `dyn CompareToInts: CompareTo<i32>` is not satisfied
-  --> $DIR/repeated-supertrait-ambig.rs:34:37
-   |
-LL |     <dyn CompareToInts>::same_as(c, 22)
-   |     ----------------------------    ^^ the trait `CompareTo<i32>` is not implemented for `dyn CompareToInts`
-   |     |
-   |     required by a bound introduced by this call
-   |
-   = help: the following other types implement trait `CompareTo<T>`:
-             <i64 as CompareTo<i64>>
-             <i64 as CompareTo<u64>>
-
-error[E0277]: the trait bound `C: CompareTo<i32>` is not satisfied
-  --> $DIR/repeated-supertrait-ambig.rs:38:27
-   |
-LL |     CompareTo::same_as(c, 22)
-   |     ------------------    ^^ the trait `CompareTo<i32>` is not implemented for `C`
-   |     |
-   |     required by a bound introduced by this call
-   |
-help: consider further restricting this bound
-   |
-LL | fn with_ufcs2<C:CompareToInts + CompareTo<i32>>(c: &C) -> bool {
-   |                               ++++++++++++++++
-
-error[E0277]: the trait bound `i64: CompareTo<i32>` is not satisfied
-  --> $DIR/repeated-supertrait-ambig.rs:42:31
-   |
-LL |     assert_eq!(22_i64.same_as(22), true);
-   |                       ------- ^^ the trait `CompareTo<i32>` is not implemented for `i64`
-   |                       |
-   |                       required by a bound introduced by this call
-   |
-   = help: the following other types implement trait `CompareTo<T>`:
-             <i64 as CompareTo<i64>>
-             <i64 as CompareTo<u64>>
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0277`.
-- 
cgit v1.2.3