Rename feature diagnostic_on_unmatch_args to diagnostic_on_unmatched_args

Author: fmease

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unmatched_args.rs

@@ -18,7 +18,7 @@ impl AttributeParser for OnUnmatchedArgsParser {
         template!(List: &[r#"/*opt*/ message = "...", /*opt*/ label = "...", /*opt*/ note = "...""#]),
         AttributeStability::Stable, // Unstable, stability checked manually in the parser
         |this, cx, args| {
-            if !cx.features().diagnostic_on_unmatch_args() {
+            if !cx.features().diagnostic_on_unmatched_args() {
                 return;
             }
 

compiler/rustc_feature/src/removed.rs

@@ -106,6 +106,8 @@ declare_features! (
     (removed, deprecated_safe, "1.95.0", Some(94978), Some("never properly implemented, in the way of attribute refactor"), 152554),
     /// Allows deriving traits as per `SmartPointer` specification
     (removed, derive_smart_pointer, "1.84.0", Some(123430), Some("replaced by `CoercePointee`"), 131284),
+    /// Allows macros to customize macro argument matcher diagnostics.
+    (removed, diagnostic_on_unmatch_args, "CURRENT_RUSTC_VERSION", Some(155642), Some("renamed to `diagnostic_on_unmatched_args`"), 157887),
     /// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
     (removed, doc_auto_cfg, "1.92.0", Some(43781), Some("merged into `doc_cfg`"), 138907),
     /// Allows `#[doc(cfg_hide(...))]`.

compiler/rustc_feature/src/unstable.rs

@@ -515,7 +515,7 @@ declare_features! (
     /// Allows giving unresolved imports a custom diagnostic message
     (unstable, diagnostic_on_unknown, "1.96.0", Some(152900)),
     /// Allows macros to customize macro argument matcher diagnostics.
-    (unstable, diagnostic_on_unmatch_args, "1.97.0", Some(155642)),
+    (unstable, diagnostic_on_unmatched_args, "1.97.0", Some(155642)),
     /// Allows `#[doc(cfg(...))]`.
     (unstable, doc_cfg, "1.21.0", Some(43781)),
     /// Allows `#[doc(masked)]`.

compiler/rustc_resolve/src/macros.rs

@@ -719,7 +719,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             (sym::on_move, Some(sym::diagnostic_on_move)),
             (sym::on_const, Some(sym::diagnostic_on_const)),
             (sym::on_unknown, Some(sym::diagnostic_on_unknown)),
-            (sym::on_unmatched_args, Some(sym::diagnostic_on_unmatch_args)),
+            (sym::on_unmatched_args, Some(sym::diagnostic_on_unmatched_args)),
             (sym::on_type_error, Some(sym::diagnostic_on_type_error)),
         ];
 

compiler/rustc_span/src/symbol.rs

@@ -816,6 +816,7 @@ symbols! {
         diagnostic_on_type_error,
         diagnostic_on_unknown,
         diagnostic_on_unmatch_args,
+        diagnostic_on_unmatched_args,
         dialect,
         direct,
         discriminant_kind,

library/core/src/lib.rs

@@ -131,7 +131,7 @@
 #![feature(deprecated_suggestion)]
 #![feature(derive_const)]
 #![feature(diagnostic_on_const)]
-#![feature(diagnostic_on_unmatch_args)]
+#![feature(diagnostic_on_unmatched_args)]
 #![feature(doc_cfg)]
 #![feature(doc_notable_trait)]
 #![feature(extern_types)]

…e-features/diagnostic-on-unmatch-args.md …features/diagnostic-on-unmatched-args.mdsrc/doc/unstable-book/src/language-features/diagnostic-on-unmatch-args.md renamed to src/doc/unstable-book/src/language-features/diagnostic-on-unmatched-args.md src/doc/unstable-book/src/language-features/diagnostic-on-unmatch-args.md renamed to src/doc/unstable-book/src/language-features/diagnostic-on-unmatched-args.md

@@ -1,12 +1,12 @@
-# `diagnostic_on_unmatch_args`
+# `diagnostic_on_unmatched_args`
 
 The tracking issue for this feature is: [#155642]
 
 [#155642]: https://github.com/rust-lang/rust/issues/155642
 
 ------------------------
 
-The `diagnostic_on_unmatch_args` feature adds the
+The `diagnostic_on_unmatched_args` feature adds the
 `#[diagnostic::on_unmatched_args(...)]` attribute for declarative macros.
 It lets a macro definition customize diagnostics for matcher failures after all arms have been
 tried, such as incomplete invocations or trailing extra arguments.
@@ -16,7 +16,7 @@ It is currently used for errors emitted by declarative macro matching itself; fr
 errors still use their existing diagnostics.
 
 ```rust,compile_fail
-#![feature(diagnostic_on_unmatch_args)]
+#![feature(diagnostic_on_unmatched_args)]
 
 #[diagnostic::on_unmatched_args(
     message = "invalid arguments to {This} macro invocation",

tests/ui/diagnostic_namespace/on_unmatched_args/auxiliary/other.rs

@@ -1,4 +1,4 @@
-#![feature(diagnostic_on_unmatch_args)]
+#![feature(diagnostic_on_unmatched_args)]
 
 #[macro_export]
 #[diagnostic::on_unmatched_args(

tests/ui/diagnostic_namespace/on_unmatched_args/message_and_label.rs

@@ -1,4 +1,4 @@
-#![feature(diagnostic_on_unmatch_args)]
+#![feature(diagnostic_on_unmatched_args)]
 
 #[diagnostic::on_unmatched_args(
     message = "invalid arguments to {This} macro invocation",

tests/ui/diagnostic_namespace/on_unmatched_args/notes_on_extra_args.rs

@@ -1,4 +1,4 @@
-#![feature(diagnostic_on_unmatch_args)]
+#![feature(diagnostic_on_unmatched_args)]
 
 #[diagnostic::on_unmatched_args(
     message = "{This}! expects exactly two arguments",