Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 38 deletions

diff --git a/src/test/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr b/src/test/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr
deleted file mode 100644
index b30bcfb77..000000000
--- a/src/test/ui/issues/issue-70724-add_type_neq_err_label-unwrap.stderr
+++ /dev/null
@@ -1,38 +0,0 @@
-error[E0369]: binary operation `==` cannot be applied to type `fn() -> i32 {a}`
-  --> $DIR/issue-70724-add_type_neq_err_label-unwrap.rs:6:5
-   |
-LL |     assert_eq!(a, 0);
-   |     ^^^^^^^^^^^^^^^^
-   |     |
-   |     fn() -> i32 {a}
-   |     {integer}
-   |
-   = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0308]: mismatched types
-  --> $DIR/issue-70724-add_type_neq_err_label-unwrap.rs:6:5
-   |
-LL |     assert_eq!(a, 0);
-   |     ^^^^^^^^^^^^^^^^ expected fn item, found integer
-   |
-   = note: expected fn item `fn() -> i32 {a}`
-                 found type `{integer}`
-   = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0277]: `fn() -> i32 {a}` doesn't implement `Debug`
-  --> $DIR/issue-70724-add_type_neq_err_label-unwrap.rs:6:5
-   |
-LL | fn a() -> i32 {
-   |    - consider calling this function
-...
-LL |     assert_eq!(a, 0);
-   |     ^^^^^^^^^^^^^^^^ `fn() -> i32 {a}` cannot be formatted using `{:?}` because it doesn't implement `Debug`
-   |
-   = help: the trait `Debug` is not implemented for fn item `fn() -> i32 {a}`
-   = help: use parentheses to call this function: `a()`
-   = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to 3 previous errors
-
-Some errors have detailed explanations: E0277, E0308, E0369.
-For more information about an error, try `rustc --explain E0277`.