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>
---
 .../formal-and-expected-differ.stderr              | 30 ----------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 src/test/ui/argument-suggestions/formal-and-expected-differ.stderr

(limited to 'src/test/ui/argument-suggestions/formal-and-expected-differ.stderr')

diff --git a/src/test/ui/argument-suggestions/formal-and-expected-differ.stderr b/src/test/ui/argument-suggestions/formal-and-expected-differ.stderr
deleted file mode 100644
index 905875b52..000000000
--- a/src/test/ui/argument-suggestions/formal-and-expected-differ.stderr
+++ /dev/null
@@ -1,30 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/formal-and-expected-differ.rs:22:29
-   |
-LL |     let _: U<_, u32> = U(1, S(3u32));
-   |                        -    ^^^^^^^ expected `f32`, found `u32`
-   |                        |
-   |                        arguments to this struct are incorrect
-   |
-   = note: expected struct `S<f32>`
-              found struct `S<u32>`
-note: tuple struct defined here
-  --> $DIR/formal-and-expected-differ.rs:9:12
-   |
-LL | pub struct U<T1, T2>(T1, S<T2>)
-   |            ^
-
-error[E0308]: mismatched types
-  --> $DIR/formal-and-expected-differ.rs:22:24
-   |
-LL |     let _: U<_, u32> = U(1, S(3u32));
-   |            ---------   ^^^^^^^^^^^^^ expected `u32`, found `f32`
-   |            |
-   |            expected due to this
-   |
-   = note: expected struct `U<_, u32>`
-              found struct `U<i32, f32>`
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0308`.
-- 
cgit v1.2.3