Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 32 insertions, 0 deletions

diff --git a/tests/ui/cross/cross-file-errors/main.rs b/tests/ui/cross/cross-file-errors/main.rs
new file mode 100644
index 000000000..4219f892d
--- /dev/null
+++ b/tests/ui/cross/cross-file-errors/main.rs
@@ -0,0 +1,7 @@
+#[macro_use]
+mod underscore;
+
+fn main() {
+    underscore!();
+    //~^ ERROR `_` can only be used on the left-hand side of an assignment
+}
diff --git a/tests/ui/cross/cross-file-errors/main.stderr b/tests/ui/cross/cross-file-errors/main.stderr
new file mode 100644
index 000000000..293a300ed
--- /dev/null
+++ b/tests/ui/cross/cross-file-errors/main.stderr
@@ -0,0 +1,15 @@
+error: in expressions, `_` can only be used on the left-hand side of an assignment
+  --> $DIR/underscore.rs:8:9
+   |
+LL |         _
+   |         ^ `_` not allowed here
+   |
+  ::: $DIR/main.rs:5:5
+   |
+LL |     underscore!();
+   |     ------------- in this macro invocation
+   |
+   = note: this error originates in the macro `underscore` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
diff --git a/tests/ui/cross/cross-file-errors/underscore.rs b/tests/ui/cross/cross-file-errors/underscore.rs
new file mode 100644
index 000000000..76e72a93f
--- /dev/null
+++ b/tests/ui/cross/cross-file-errors/underscore.rs
@@ -0,0 +1,10 @@
+// We want this file only so we can test cross-file error
+// messages, but we don't want it in an external crate.
+// ignore-test
+#![crate_type = "lib"]
+
+macro_rules! underscore {
+    () => (
+        _
+    )
+}