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>
---
 .../compare-method/traits-misc-mismatch-1.stderr   | 66 ----------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 src/test/ui/compare-method/traits-misc-mismatch-1.stderr

(limited to 'src/test/ui/compare-method/traits-misc-mismatch-1.stderr')

diff --git a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr b/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
deleted file mode 100644
index 805c04536..000000000
--- a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr
+++ /dev/null
@@ -1,66 +0,0 @@
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/traits-misc-mismatch-1.rs:27:26
-   |
-LL |     fn test_error1_fn<T: Eq>(&self);
-   |     -------------------------------- definition of `test_error1_fn` from trait
-...
-LL |     fn test_error1_fn<T: Ord>(&self) {}
-   |                          ^^^ impl has extra requirement `T: Ord`
-
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/traits-misc-mismatch-1.rs:31:31
-   |
-LL |     fn test_error2_fn<T: Eq + Ord>(&self);
-   |     -------------------------------------- definition of `test_error2_fn` from trait
-...
-LL |     fn test_error2_fn<T: Eq + B>(&self) {}
-   |                               ^ impl has extra requirement `T: B`
-
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/traits-misc-mismatch-1.rs:35:26
-   |
-LL |     fn test_error3_fn<T: Eq + Ord>(&self);
-   |     -------------------------------------- definition of `test_error3_fn` from trait
-...
-LL |     fn test_error3_fn<T: B + Eq>(&self) {}
-   |                          ^ impl has extra requirement `T: B`
-
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/traits-misc-mismatch-1.rs:45:26
-   |
-LL |     fn test_error5_fn<T: A>(&self);
-   |     ------------------------------- definition of `test_error5_fn` from trait
-...
-LL |     fn test_error5_fn<T: B>(&self) {}
-   |                          ^ impl has extra requirement `T: B`
-
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/traits-misc-mismatch-1.rs:51:30
-   |
-LL |     fn test_error7_fn<T: A>(&self);
-   |     ------------------------------- definition of `test_error7_fn` from trait
-...
-LL |     fn test_error7_fn<T: A + Eq>(&self) {}
-   |                              ^^ impl has extra requirement `T: Eq`
-
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/traits-misc-mismatch-1.rs:54:26
-   |
-LL |     fn test_error8_fn<T: B>(&self);
-   |     ------------------------------- definition of `test_error8_fn` from trait
-...
-LL |     fn test_error8_fn<T: C>(&self) {}
-   |                          ^ impl has extra requirement `T: C`
-
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/traits-misc-mismatch-1.rs:67:18
-   |
-LL |     fn method<G:Getter<isize>>(&self);
-   |     ---------------------------------- definition of `method` from trait
-...
-LL |     fn method<G: Getter<usize>>(&self) {}
-   |                  ^^^^^^^^^^^^^ impl has extra requirement `G: Getter<usize>`
-
-error: aborting due to 7 previous errors
-
-For more information about this error, try `rustc --explain E0276`.
-- 
cgit v1.2.3