Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/ui/parser/macro/trait-non-item-macros.rs b/tests/ui/parser/macro/trait-non-item-macros.rs
new file mode 100644
index 000000000..97fb564bf
--- /dev/null
+++ b/tests/ui/parser/macro/trait-non-item-macros.rs
@@ -0,0 +1,13 @@
+macro_rules! bah {
+    ($a:expr) => {
+        $a
+    }; //~^ ERROR macro expansion ignores token `2` and any following
+}
+
+trait Bar {
+    bah!(2);
+}
+
+fn main() {
+    let _recovery_witness: () = 0; //~ ERROR mismatched types
+}