Convert all of the grammar to use the new grammar renderer

Author: ehuss

src/abi.md

@@ -81,7 +81,7 @@ extern "C" fn foo() {}
 
 The *`link_section` attribute* specifies the section of the object file that a
 [function] or [static]'s content will be placed into. It uses the
-[_MetaNameValueStr_] syntax to specify the section name.
+[MetaNameValueStr] syntax to specify the section name.
 
 This attribute is unsafe as it allows users to place data and code into sections
 of memory not expecting them, such as mutable data into read-only areas.
@@ -99,7 +99,7 @@ pub static VAR1: u32 = 1;
 ## The `export_name` attribute
 
 The *`export_name` attribute* specifies the name of the symbol that will be
-exported on a [function] or [static]. It uses the [_MetaNameValueStr_] syntax
+exported on a [function] or [static]. It uses the [MetaNameValueStr] syntax
 to specify the symbol name.
 
 This attribute is unsafe as a symbol with a custom name may collide with another
@@ -114,7 +114,6 @@ pub fn name_in_rust() { }
 > [!EDITION-2024]
 > Before the 2024 edition it is allowed to use the `export_name` attribute without the `unsafe` qualification.
 
-[_MetaNameValueStr_]: attributes.md#meta-item-attribute-syntax
 [`static` items]: items/static-items.md
 [attribute]: attributes.md
 [extern functions]: items/functions.md#extern-function-qualifier

src/attributes.md

@@ -3,20 +3,19 @@ r[attributes]
 # Attributes
 
 r[attributes.syntax]
-> **<sup>Syntax</sup>**\
-> _InnerAttribute_ :\
-> &nbsp;&nbsp; `#` `!` `[` _Attr_ `]`
->
-> _OuterAttribute_ :\
-> &nbsp;&nbsp; `#` `[` _Attr_ `]`
->
-> _Attr_ :\
-> &nbsp;&nbsp; &nbsp;&nbsp; [_SimplePath_] _AttrInput_<sup>?</sup>\
-> &nbsp;&nbsp; | `unsafe` `(` [_SimplePath_] _AttrInput_<sup>?</sup> `)`
->
-> _AttrInput_ :\
-> &nbsp;&nbsp; &nbsp;&nbsp; [_DelimTokenTree_]\
-> &nbsp;&nbsp; | `=` [_Expression_]
+```grammar,attributes
+InnerAttribute -> `#` `!` `[` Attr `]`
+
+OuterAttribute -> `#` `[` Attr `]`
+
+Attr ->
+      SimplePath AttrInput?
+    | `unsafe` `(` SimplePath AttrInput? `)`
+
+AttrInput ->
+      DelimTokenTree
+    | `=` Expression
+```
 
 r[attributes.intro]
 An _attribute_ is a general, free-form metadatum that is interpreted according
@@ -114,18 +113,19 @@ A "meta item" is the syntax used for the _Attr_ rule by most [built-in
 attributes]. It has the following grammar:
 
 r[attributes.meta.syntax]
-> **<sup>Syntax</sup>**\
-> _MetaItem_ :\
-> &nbsp;&nbsp; &nbsp;&nbsp; [_SimplePath_]\
-> &nbsp;&nbsp; | [_SimplePath_] `=` [_Expression_]\
-> &nbsp;&nbsp; | [_SimplePath_] `(` _MetaSeq_<sup>?</sup> `)`
->
-> _MetaSeq_ :\
-> &nbsp;&nbsp; _MetaItemInner_ ( `,` MetaItemInner )<sup>\*</sup> `,`<sup>?</sup>
->
-> _MetaItemInner_ :\
-> &nbsp;&nbsp; &nbsp;&nbsp; _MetaItem_\
-> &nbsp;&nbsp; | [_Expression_]
+```grammar,attributes
+MetaItem ->
+      SimplePath
+    | SimplePath `=` Expression
+    | SimplePath `(` MetaSeq? `)`
+
+MetaSeq ->
+    MetaItemInner ( `,` MetaItemInner )* `,`?
+
+MetaItemInner ->
+      MetaItem
+    | Expression
+```
 
 r[attributes.meta.literal-expr]
 Expressions in meta items must macro-expand to literal expressions, which must not
@@ -163,21 +163,22 @@ specify their inputs. The following grammar rules show some commonly used
 forms:
 
 r[attributes.meta.builtin.syntax]
-> **<sup>Syntax</sup>**\
-> _MetaWord_:\
-> &nbsp;&nbsp; [IDENTIFIER]
->
-> _MetaNameValueStr_:\
-> &nbsp;&nbsp; [IDENTIFIER] `=` ([STRING_LITERAL] | [RAW_STRING_LITERAL])
->
-> _MetaListPaths_:\
-> &nbsp;&nbsp; [IDENTIFIER] `(` ( [_SimplePath_] (`,` [_SimplePath_])* `,`<sup>?</sup> )<sup>?</sup> `)`
->
-> _MetaListIdents_:\
-> &nbsp;&nbsp; [IDENTIFIER] `(` ( [IDENTIFIER] (`,` [IDENTIFIER])* `,`<sup>?</sup> )<sup>?</sup> `)`
->
-> _MetaListNameValueStr_:\
-> &nbsp;&nbsp; [IDENTIFIER] `(` ( _MetaNameValueStr_ (`,` _MetaNameValueStr_)* `,`<sup>?</sup> )<sup>?</sup> `)`
+```grammar,attributes
+MetaWord ->
+    IDENTIFIER
+
+MetaNameValueStr ->
+    IDENTIFIER `=` (STRING_LITERAL | RAW_STRING_LITERAL)
+
+MetaListPaths ->
+    IDENTIFIER `(` ( SimplePath (`,` SimplePath)* `,`? )? `)`
+
+MetaListIdents ->
+    IDENTIFIER `(` ( IDENTIFIER (`,` IDENTIFIER)* `,`? )? `)`
+
+MetaListNameValueStr ->
+    IDENTIFIER `(` ( MetaNameValueStr (`,` MetaNameValueStr)* `,`? )? `)`
+```
 
 Some examples of meta items are:
 
@@ -331,14 +332,8 @@ The following is an index of all built-in attributes.
 [ECMA-334]: https://www.ecma-international.org/publications-and-standards/standards/ecma-334/
 [ECMA-335]: https://www.ecma-international.org/publications-and-standards/standards/ecma-335/
 [Expression Attributes]: expressions.md#expression-attributes
-[IDENTIFIER]: identifiers.md
-[RAW_STRING_LITERAL]: tokens.md#raw-string-literals
-[STRING_LITERAL]: tokens.md#string-literals
 [The Rustdoc Book]: ../rustdoc/the-doc-attribute.html
 [The Unstable Book]: ../unstable-book/index.html
-[_DelimTokenTree_]: macros.md
-[_Expression_]: expressions.md
-[_SimplePath_]: paths.md#simple-paths
 [`allow`]: attributes/diagnostics.md#lint-check-attributes
 [`automatically_derived`]: attributes/derive.md#the-automatically_derived-attribute
 [`cfg_attr`]: conditional-compilation.md#the-cfg_attr-attribute

src/attributes/codegen.md

@@ -59,7 +59,7 @@ r[attributes.codegen.target_feature]
 r[attributes.codegen.target_feature.intro]
 The *`target_feature` [attribute]* may be applied to a function to
 enable code generation of that function for specific platform architecture
-features. It uses the [_MetaListNameValueStr_] syntax with a single key of
+features. It uses the [MetaListNameValueStr] syntax with a single key of
 `enable` whose value is a string of comma-separated feature names to enable.
 
 ```rust
@@ -495,7 +495,6 @@ trait object whose methods are attributed.
 > [!NOTE]
 > The aforementioned shim for function pointers is necessary because `rustc` implements `track_caller` in a codegen context by appending an implicit parameter to the function ABI, but this would be unsound for an indirect call because the parameter is not a part of the function's type and a given function pointer type may or may not refer to a function with the attribute. The creation of a shim hides the implicit parameter from callers of the function pointer, preserving soundness.
 
-[_MetaListNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
 [`-C target-cpu`]: ../../rustc/codegen-options/index.html#target-cpu
 [`-C target-feature`]: ../../rustc/codegen-options/index.html#target-feature
 [`is_x86_feature_detected`]: ../../std/arch/macro.is_x86_feature_detected.html

src/attributes/debugger.md

@@ -11,7 +11,7 @@ The *`debugger_visualizer` attribute* can be used to embed a debugger visualizer
 This enables an improved debugger experience for displaying values in the debugger.
 
 r[attributes.debugger.debugger_visualizer.syntax]
-It uses the [_MetaListNameValueStr_] syntax to specify its inputs, and must be specified as a crate attribute.
+It uses the [MetaListNameValueStr] syntax to specify its inputs, and must be specified as a crate attribute.
 
 r[attributes.debugger.debugger_visualizer.natvis]
 ### Using `debugger_visualizer` with Natvis
@@ -150,7 +150,6 @@ When the crate's debug executable is passed into GDB[^rust-gdb], `print bob` wil
 [attributes]: ../attributes.md
 [Natvis documentation]: https://docs.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects
 [pretty printing documentation]: https://sourceware.org/gdb/onlinedocs/gdb/Pretty-Printing.html
-[_MetaListNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
 
 r[attributes.debugger.collapse_debuginfo]
 ## The `collapse_debuginfo` attribute
@@ -160,7 +159,7 @@ The *`collapse_debuginfo` [attribute]* controls whether code locations from a ma
 when generating debuginfo for code calling this macro.
 
 r[attributes.debugger.collapse_debuginfo.syntax]
-The attribute uses the [_MetaListIdents_] syntax to specify its inputs, and can only be applied to macro definitions.
+The attribute uses the [MetaListIdents] syntax to specify its inputs, and can only be applied to macro definitions.
 
 r[attributes.debugger.collapse_debuginfo.options]
 Accepted options:
@@ -185,4 +184,3 @@ macro_rules! example {
 ```
 
 [attribute]: ../attributes.md
-[_MetaListIdents_]: ../attributes.md#meta-item-attribute-syntax

src/attributes/derive.md

@@ -6,7 +6,7 @@ The *`derive` attribute* allows new [items] to be automatically generated for
 data structures.
 
 r[attributes.derive.syntax]
-It uses the [_MetaListPaths_] syntax to specify a list of
+It uses the [MetaListPaths] syntax to specify a list of
 traits to implement or paths to [derive macros] to process.
 
 For example, the following will create an [`impl` item] for the
@@ -43,7 +43,6 @@ The *`automatically_derived` attribute* is automatically added to
 has no direct effect, but it may be used by tools and diagnostic lints to
 detect these automatically generated implementations.
 
-[_MetaListPaths_]: ../attributes.md#meta-item-attribute-syntax
 [`impl` item]: ../items/implementations.md
 [items]: ../items.md
 [derive macros]: ../procedural-macros.md#derive-macros

src/attributes/diagnostics.md

@@ -12,7 +12,7 @@ unreachable code or omitted documentation.
 
 r[attributes.diagnostics.lint.level]
 The lint attributes `allow`,
-`expect`, `warn`, `deny`, and `forbid` use the [_MetaListPaths_] syntax
+`expect`, `warn`, `deny`, and `forbid` use the [MetaListPaths] syntax
 to specify a list of lint names to change the lint level for the entity
 to which the attribute applies.
 
@@ -313,7 +313,7 @@ The `deprecated` attribute has several forms:
 - `deprecated` --- Issues a generic message.
 - `deprecated = "message"` --- Includes the given string in the deprecation
   message.
-- [_MetaListNameValueStr_] syntax with two optional fields:
+- [MetaListNameValueStr] syntax with two optional fields:
   - `since` --- Specifies a version number when the item was deprecated. `rustc`
     does not currently interpret the string, but external tools like [Clippy]
     may check the validity of the value.
@@ -359,7 +359,7 @@ and [traits].
 
 r[attributes.diagnostics.must_use.message]
 The `must_use` attribute may include a message by using the
-[_MetaNameValueStr_] syntax such as `#[must_use = "example message"]`. The
+[MetaNameValueStr] syntax such as `#[must_use = "example message"]`. The
 message will be given alongside the warning.
 
 r[attributes.diagnostics.must_use.type]
@@ -483,7 +483,7 @@ r[attributes.diagnostic.on_unimplemented.allowed-positions]
 The attribute should be placed on a [trait declaration], though it is not an error to be located in other positions.
 
 r[attributes.diagnostic.on_unimplemented.syntax]
-The attribute uses the [_MetaListNameValueStr_] syntax to specify its inputs, though any malformed input to the attribute is not considered as an error to provide both forwards and backwards compatibility.
+The attribute uses the [MetaListNameValueStr] syntax to specify its inputs, though any malformed input to the attribute is not considered as an error to provide both forwards and backwards compatibility.
 
 r[attributes.diagnostic.on_unimplemented.keys]
 The following keys have the given meaning:
@@ -663,9 +663,6 @@ error[E0277]: the trait bound `&str: AsExpression<Integer>` is not satisfied
 The first error message includes a somewhat confusing error message about the relationship of `&str` and `Expression`, as well as the unsatisfied trait bound in the blanket impl. After adding `#[diagnostic::do_not_recommend]`, it no longer considers the blanket impl for the recommendation. The message should be a little clearer, with an indication that a string cannot be converted to an `Integer`.
 
 [Clippy]: https://github.com/rust-lang/rust-clippy
-[_MetaListNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
-[_MetaListPaths_]: ../attributes.md#meta-item-attribute-syntax
-[_MetaNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
 [`Drop`]: ../special-types-and-traits.md#drop
 [attributes]: ../attributes.md
 [block expression]: ../expressions/block-expr.md

src/attributes/limits.md

@@ -12,7 +12,7 @@ maximum depth for potentially infinitely-recursive compile-time operations
 like macro expansion or auto-dereference.
 
 r[attributes.limits.recursion_limit.syntax]
-It uses the [_MetaNameValueStr_]
+It uses the [MetaNameValueStr]
 syntax to specify the recursion depth.
 
 > [!NOTE]
@@ -53,7 +53,7 @@ The *`type_length_limit` attribute* limits the maximum number of type
 substitutions made when constructing a concrete type during monomorphization.
 
 r[attributes.limits.type_length_limit.syntax]
-It is applied at the [crate] level, and uses the [_MetaNameValueStr_] syntax
+It is applied at the [crate] level, and uses the [MetaNameValueStr] syntax
 to set the limit based on the number of type substitutions.
 
 > [!NOTE]
@@ -69,6 +69,5 @@ fn f<T>(x: T) {}
 f(((((1,), 2), 3), 4));
 ```
 
-[_MetaNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
 [attributes]: ../attributes.md
 [crate]: ../crates-and-source-files.md

src/attributes/testing.md

@@ -57,7 +57,7 @@ A function annotated with the `test` attribute can also be annotated with the
 execute that function as a test. It will still be compiled when in test mode.
 
 r[attributes.testing.ignore.syntax]
-The `ignore` attribute may optionally be written with the [_MetaNameValueStr_]
+The `ignore` attribute may optionally be written with the [MetaNameValueStr]
 syntax to specify a reason why the test is ignored.
 
 ```rust
@@ -86,7 +86,7 @@ r[attributes.testing.should_panic.syntax]
 The `should_panic` attribute may optionally take an input string that must
 appear within the panic message. If the string is not found in the message,
 then the test will fail. The string may be passed using the
-[_MetaNameValueStr_] syntax or the [_MetaListNameValueStr_] syntax with an
+[MetaNameValueStr] syntax or the [MetaListNameValueStr] syntax with an
 `expected` field.
 
 ```rust
@@ -97,8 +97,6 @@ fn mytest() {
 }
 ```
 
-[_MetaListNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
-[_MetaNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
 [`Termination`]: std::process::Termination
 [`report`]: std::process::Termination::report
 [`test` conditional compilation option]: ../conditional-compilation.md#test

src/attributes/type_system.md

@@ -14,7 +14,7 @@ r[attributes.type-system.non_exhaustive.allowed-positions]
 It can be applied to [`struct`s][struct], [`enum`s][enum], and `enum` variants.
 
 r[attributes.type-system.non_exhaustive.syntax]
-The `non_exhaustive` attribute uses the [_MetaWord_] syntax and thus does not
+The `non_exhaustive` attribute uses the [MetaWord] syntax and thus does not
 take any inputs.
 
 r[attributes.type-system.non_exhaustive.same-crate]
@@ -80,7 +80,7 @@ r[attributes.type-system.non_exhaustive.construction]
 Non-exhaustive types cannot be constructed outside of the defining crate:
 
 - Non-exhaustive variants ([`struct`][struct] or [`enum` variant][enum]) cannot be constructed
-  with a [_StructExpression_] \(including with [functional update syntax]).
+  with a [StructExpression] \(including with [functional update syntax]).
 - The implicitly defined same-named constant of a [unit-like struct][struct],
   or the same-named constructor function of a [tuple struct][struct],
   has a [visibility] no greater than `pub(crate)`.
@@ -132,7 +132,7 @@ r[attributes.type-system.non_exhaustive.match]
 There are limitations when matching on non-exhaustive types outside of the defining crate:
 
 - When pattern matching on a non-exhaustive variant ([`struct`][struct] or [`enum` variant][enum]),
-  a [_StructPattern_] must be used which must include a `..`. A tuple variant's constructor's
+  a [StructPattern] must be used which must include a `..`. A tuple variant's constructor's
   [visibility] is reduced to be no greater than `pub(crate)`.
 - When pattern matching on a non-exhaustive [`enum`][enum], matching on a variant does not
   contribute towards the exhaustiveness of the arms.
@@ -206,10 +206,6 @@ let _ = EnumWithNonExhaustiveVariants::First as u8;
 
 Non-exhaustive types are always considered inhabited in downstream crates.
 
-[_MetaWord_]: ../attributes.md#meta-item-attribute-syntax
-[_StructExpression_]: ../expressions/struct-expr.md
-[_StructPattern_]: ../patterns.md#struct-patterns
-[_TupleStructPattern_]: ../patterns.md#tuple-struct-patterns
 [`if let`]: ../expressions/if-expr.md#if-let-expressions
 [`match`]: ../expressions/match-expr.md
 [attributes]: ../attributes.md