From e4ba8b0e94c884729999ec609026d26f9dedc860 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 2 Oct 2024 13:37:46 -0700
Subject: [PATCH 1/2] Add `expr_2021` macro fragment specifier

---
 src/macros-by-example.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/macros-by-example.md b/src/macros-by-example.md
index 17e738897..dad88a55a 100644
--- a/src/macros-by-example.md
+++ b/src/macros-by-example.md
@@ -30,7 +30,7 @@ r[macro.decl.syntax]
 > &nbsp;&nbsp; | `$` `(` _MacroMatch_<sup>+</sup> `)` _MacroRepSep_<sup>?</sup> _MacroRepOp_
 >
 > _MacroFragSpec_ :\
-> &nbsp;&nbsp; &nbsp;&nbsp; `block` | `expr` | `ident` | `item` | `lifetime` | `literal`\
+> &nbsp;&nbsp; &nbsp;&nbsp; `block` | `expr` | `expr_2021` | `ident` | `item` | `lifetime` | `literal`\
 > &nbsp;&nbsp; | `meta` | `pat` | `pat_param` | `path` | `stmt` | `tt` | `ty` | `vis`
 >
 > _MacroRepSep_ :\
@@ -143,7 +143,8 @@ Valid fragment specifiers are:
     statements that require semicolons)
   * `pat_param`: a [_PatternNoTopAlt_]
   * `pat`: at least any [_PatternNoTopAlt_], and possibly more depending on edition
-  * `expr`: an [_Expression_]
+  * `expr`: an [_Expression_] except [_UnderscoreExpression_] and [_ConstBlockExpression_] (see [macro.decl.meta.expr-underscore])
+  * `expr_2021`: same as `expr` (see [macro.decl.meta.edition2021])
   * `ty`: a [_Type_]
   * `ident`: an [IDENTIFIER_OR_KEYWORD] or [RAW_IDENTIFIER]
   * `path`: a [_TypePath_] style path
@@ -175,6 +176,8 @@ r[macro.decl.meta.edition2021]
 > Before the 2021 edition, they match exactly the same fragments as `pat_param` (that is, they accept [_PatternNoTopAlt_]).
 >
 > The relevant edition is the one in effect for the `macro_rules!` definition.
+>
+> The `expr_2021` fragment specifier exists to maintain backwards compatibility with editions before 2024.
 
 ## Repetitions
 
@@ -572,6 +575,7 @@ For more detail, see the [formal specification].
 [Repetitions]: #repetitions
 [_Attr_]: attributes.md
 [_BlockExpression_]: expressions/block-expr.md
+[_ConstBlockExpression_]: expressions/block-expr.md#const-blocks
 [_DelimTokenTree_]: macros.md
 [_Expression_]: expressions.md
 [_Item_]: items.md

From a5f20e3310a8b1051973f2dd14020101597ceefe Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 20 Aug 2024 11:59:03 -0700
Subject: [PATCH 2/2] Add expr_2021 to FOLLOW set rules

---
 src/macro-ambiguity.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/macro-ambiguity.md b/src/macro-ambiguity.md
index 01ae288a3..d8ca4804f 100644
--- a/src/macro-ambiguity.md
+++ b/src/macro-ambiguity.md
@@ -325,7 +325,7 @@ represent simple nonterminals with the given fragment specifier.
 
   * FOLLOW(pat) = {`=>`, `,`, `=`, `|`, `if`, `in`}`.
 
-  * FOLLOW(expr) = FOLLOW(stmt) =  {`=>`, `,`, `;`}`.
+  * FOLLOW(expr) = FOLLOW(expr_2021) = FOLLOW(stmt) =  {`=>`, `,`, `;`}`.
 
   * FOLLOW(ty) = FOLLOW(path) = {`{`, `[`, `,`, `=>`, `:`, `=`, `>`, `>>`, `;`,
     `|`, `as`, `where`, block nonterminals}.