extend on_missing_args to no-match

Author: chenyukang

compiler/rustc_expand/src/mbe/diagnostics.rs

@@ -90,13 +90,6 @@ pub(super) fn failed_to_match_macro(
                     },
                 )
             })
-            .map(|diag| {
-                if matches!(token.kind, token::Eof) {
-                    diag
-                } else {
-                    CustomDiagnostic { message: None, label: None, ..diag }
-                }
-            })
             .unwrap_or_default()
     };
 

src/doc/unstable-book/src/language-features/diagnostic-on-missing-args.md

@@ -8,13 +8,12 @@ The tracking issue for this feature is: [#152494]
 
 The `diagnostic_on_missing_args` feature adds the
 `#[diagnostic::on_missing_args(...)]` attribute for declarative macros.
-It lets a macro definition customize the diagnostic that is emitted when an invocation ends before
-all required arguments were provided.
+It lets a macro definition customize diagnostics for matcher failures after all arms have been
+tried, such as incomplete invocations or trailing extra arguments.
 
 This attribute currently applies to declarative macros such as `macro_rules!` and `pub macro`.
-Custom `message` and `label` are only used for incomplete invocations.
-Custom `note`s are also emitted for other matcher failures where no macro arm matches, such as
-trailing extra arguments.
+It is currently used for errors emitted by declarative macro matching itself; fragment parser
+errors still use their existing diagnostics.
 
 ```rust,compile_fail
 #![feature(diagnostic_on_missing_args)]

tests/ui/diagnostic_namespace/on_missing_args/notes_on_extra_args.rs

@@ -1,6 +1,8 @@
 #![feature(diagnostic_on_missing_args)]
 
 #[diagnostic::on_missing_args(
+    message = "{This}! expects exactly two arguments",
+    label = "unexpected extra input starts here",
     note = "this macro expects a type and a value, like `pair!(u8, 0)`",
     note = "make sure to pass both arguments",
 )]
@@ -12,8 +14,8 @@ macro_rules! pair {
 
 fn main() {
     pair!(u8, 0, 42);
-    //~^ ERROR no rules expected `,`
-    //~| NOTE no rules expected this token in macro call
+    //~^ ERROR pair! expects exactly two arguments
+    //~| NOTE unexpected extra input starts here
     //~| NOTE this macro expects a type and a value, like `pair!(u8, 0)`
     //~| NOTE make sure to pass both arguments
 }

tests/ui/diagnostic_namespace/on_missing_args/notes_on_extra_args.stderr

@@ -1,14 +1,14 @@
-error: no rules expected `,`
-  --> $DIR/notes_on_extra_args.rs:14:16
+error: pair! expects exactly two arguments
+  --> $DIR/notes_on_extra_args.rs:16:16
    |
 LL | macro_rules! pair {
    | ----------------- when calling this macro
 ...
 LL |     pair!(u8, 0, 42);
-   |                ^ no rules expected this token in macro call
+   |                ^ unexpected extra input starts here
    |
 note: while trying to match meta-variable `$value:expr`
-  --> $DIR/notes_on_extra_args.rs:9:14
+  --> $DIR/notes_on_extra_args.rs:11:14
    |
 LL |     ($ty:ty, $value:expr) => {};
    |              ^^^^^^^^^^^

tests/ui/diagnostic_namespace/on_missing_args/other_match_macro_error.rs

@@ -0,0 +1,14 @@
+#![feature(diagnostic_on_missing_args)]
+
+#[diagnostic::on_missing_args(
+    message = "invalid route method",
+    note = "this macro expects a action, like `{This}!(get \"/hello\")`"
+)]
+macro_rules! route {
+    (get $path:literal) => {};
+}
+
+fn main() {
+    route!(post "/");
+    //~^ ERROR invalid route method
+}

tests/ui/diagnostic_namespace/on_missing_args/other_match_macro_error.stderr

@@ -0,0 +1,18 @@
+error: invalid route method
+  --> $DIR/other_match_macro_error.rs:12:12
+   |
+LL | macro_rules! route {
+   | ------------------ when calling this macro
+...
+LL |     route!(post "/");
+   |            ^^^^ no rules expected this token in macro call
+   |
+note: while trying to match `get`
+  --> $DIR/other_match_macro_error.rs:8:6
+   |
+LL |     (get $path:literal) => {};
+   |      ^^^
+   = note: this macro expects a action, like `route!(get "/hello")`
+
+error: aborting due to 1 previous error
+