Merge pull request #1130 from mattheww/2022-01_metavariable_names

ehuss · web-flow · commit 434eb96e2911 · 2022-01-09T08:40:03.000-08:00
Improve the documentation of macros-by-example metavariable names
diff --git a/src/macros-by-example.md b/src/macros-by-example.md
@@ -23,7 +23,7 @@
 > _MacroMatch_ :\
 > &nbsp;&nbsp; &nbsp;&nbsp; [_Token_]<sub>_except $ and delimiters_</sub>\
 > &nbsp;&nbsp; | _MacroMatcher_\
-> &nbsp;&nbsp; | `$` [IDENTIFIER] `:` _MacroFragSpec_\
+> &nbsp;&nbsp; | `$` ( [IDENTIFIER_OR_KEYWORD] <sub>_except `crate`_</sub> | [RAW_IDENTIFIER] | `_` ) `:` _MacroFragSpec_\
 > &nbsp;&nbsp; | `$` `(` _MacroMatch_<sup>+</sup> `)` _MacroRepSep_<sup>?</sup> _MacroRepOp_
 >
 > _MacroFragSpec_ :\

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`> _MacroMatch_ :\`
`24`	`24`	`>       [_Token_]<sub>_except $ and delimiters_</sub>\`
`25`	`25`	`>    \| _MacroMatcher_\`
`26`		->    \| `$` [IDENTIFIER] `:` _MacroFragSpec_\
	`26`	+>    \| `$` ( [IDENTIFIER_OR_KEYWORD] <sub>_except `crate`_</sub> \| [RAW_IDENTIFIER] \| `_` ) `:` _MacroFragSpec_\
`27`	`27`	>    \| `$` `(` _MacroMatch_<sup>+</sup> `)` _MacroRepSep_<sup>?</sup> _MacroRepOp_
`28`	`28`	`>`
`29`	`29`	`> _MacroFragSpec_ :\`