Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/xc-private-method2.stderr b/tests/ui/xc-private-method2.stderr
new file mode 100644
index 000000000..b569882f8
--- /dev/null
+++ b/tests/ui/xc-private-method2.stderr
@@ -0,0 +1,25 @@
+error[E0624]: associated function `meth_struct` is private
+  --> $DIR/xc-private-method2.rs:6:52
+   |
+LL |     let _ = xc_private_method_lib::Struct{ x: 10 }.meth_struct();
+   |                                                    ^^^^^^^^^^^ private associated function
+   |
+  ::: $DIR/auxiliary/xc-private-method-lib.rs:12:5
+   |
+LL |     fn meth_struct(&self) -> isize {
+   |     ------------------------------ private associated function defined here
+
+error[E0624]: associated function `meth_enum` is private
+  --> $DIR/xc-private-method2.rs:9:55
+   |
+LL |     let _ = xc_private_method_lib::Enum::Variant1(20).meth_enum();
+   |                                                       ^^^^^^^^^ private associated function
+   |
+  ::: $DIR/auxiliary/xc-private-method-lib.rs:27:5
+   |
+LL |     fn meth_enum(&self) -> isize {
+   |     ---------------------------- private associated function defined here
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0624`.