Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/ui/parser/macro/pub-item-macro.stderr b/tests/ui/parser/macro/pub-item-macro.stderr
new file mode 100644
index 000000000..9a2fffcce
--- /dev/null
+++ b/tests/ui/parser/macro/pub-item-macro.stderr
@@ -0,0 +1,31 @@
+error: can't qualify macro invocation with `pub`
+  --> $DIR/pub-item-macro.rs:10:5
+   |
+LL |     pub priv_x!();
+   |     ^^^ help: remove the visibility
+...
+LL |     pub_x!();
+   |     -------- in this macro invocation
+   |
+   = help: try adjusting the macro to put `pub` inside the invocation
+   = note: this error originates in the macro `pub_x` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0603]: static `x` is private
+  --> $DIR/pub-item-macro.rs:20:23
+   |
+LL |     let y: u32 = foo::x;
+   |                       ^ private static
+   |
+note: the static `x` is defined here
+  --> $DIR/pub-item-macro.rs:5:9
+   |
+LL |         static x: u32 = 0;
+   |         ^^^^^^^^^^^^^^^^^^
+...
+LL |     pub_x!();
+   |     -------- in this macro invocation
+   = note: this error originates in the macro `priv_x` which comes from the expansion of the macro `pub_x` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0603`.