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/issues/issue-26094.rs b/tests/ui/issues/issue-26094.rs
new file mode 100644
index 000000000..d3d670aa9
--- /dev/null
+++ b/tests/ui/issues/issue-26094.rs
@@ -0,0 +1,13 @@
+macro_rules! some_macro {
+    ($other: expr) => ({
+        $other(None) //~ NOTE argument of type `Option<_>` unexpected
+    })
+}
+
+fn some_function() {} //~ NOTE defined here
+
+fn main() {
+    some_macro!(some_function);
+    //~^ ERROR function takes 0 arguments but 1 argument was supplied
+    //~| NOTE in this expansion of some_macro!
+}