Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/ui/confuse-field-and-method/issue-33784.stderr b/tests/ui/confuse-field-and-method/issue-33784.stderr
new file mode 100644
index 000000000..3906d64c9
--- /dev/null
+++ b/tests/ui/confuse-field-and-method/issue-33784.stderr
@@ -0,0 +1,36 @@
+error[E0599]: no method named `closure` found for reference `&Obj<[closure@issue-33784.rs:25:43]>` in the current scope
+  --> $DIR/issue-33784.rs:27:7
+   |
+LL |     p.closure();
+   |       ^^^^^^^ field, not a method
+   |
+help: to call the function stored in `closure`, surround the field access with parentheses
+   |
+LL |     (p.closure)();
+   |     +         +
+
+error[E0599]: no method named `fn_ptr` found for reference `&&Obj<[closure@issue-33784.rs:25:43]>` in the current scope
+  --> $DIR/issue-33784.rs:29:7
+   |
+LL |     q.fn_ptr();
+   |       ^^^^^^ field, not a method
+   |
+help: to call the function stored in `fn_ptr`, surround the field access with parentheses
+   |
+LL |     (q.fn_ptr)();
+   |     +        +
+
+error[E0599]: no method named `c_fn_ptr` found for reference `&D` in the current scope
+  --> $DIR/issue-33784.rs:32:7
+   |
+LL |     s.c_fn_ptr();
+   |       ^^^^^^^^ field, not a method
+   |
+help: to call the function stored in `c_fn_ptr`, surround the field access with parentheses
+   |
+LL |     (s.c_fn_ptr)();
+   |     +          +
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0599`.