Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/ui/static/issue-5216.stderr b/tests/ui/static/issue-5216.stderr
new file mode 100644
index 000000000..1afff28f0
--- /dev/null
+++ b/tests/ui/static/issue-5216.stderr
@@ -0,0 +1,28 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-5216.rs:3:21
+   |
+LL | pub static C: S = S(f);
+   |                   - ^ expected struct `Box`, found fn item
+   |                   |
+   |                   arguments to this struct are incorrect
+   |
+   = note: expected struct `Box<(dyn FnMut() + Sync + 'static)>`
+             found fn item `fn() {f}`
+note: tuple struct defined here
+  --> $DIR/issue-5216.rs:2:8
+   |
+LL | struct S(Box<dyn FnMut() + Sync>);
+   |        ^
+
+error[E0308]: mismatched types
+  --> $DIR/issue-5216.rs:8:19
+   |
+LL | pub static D: T = g;
+   |                   ^ expected struct `Box`, found fn item
+   |
+   = note: expected struct `Box<(dyn FnMut() + Sync + 'static)>`
+             found fn item `fn() {g}`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.