Enable OrPatNonterminalMode::TopPat in edition 2021.

m-ou-se · m-ou-se · commit cfee9fb07b95 · 2020-12-24T16:55:39.000+01:00
diff --git a/compiler/rustc_expand/src/mbe/macro_parser.rs b/compiler/rustc_expand/src/mbe/macro_parser.rs
@@ -421,8 +421,7 @@ fn token_name_eq(t1: &Token, t2: &Token) -> bool {
 fn or_pat_mode(edition: Edition) -> OrPatNonterminalMode {
     match edition {
         Edition::Edition2015 | Edition::Edition2018 => OrPatNonterminalMode::NoTopAlt,
-        // FIXME(mark-i-m): uncomment this when edition 2021 machinery is added.
-        // Edition::Edition2021 =>  OrPatNonterminalMode::TopPat,
+        Edition::Edition2021 => OrPatNonterminalMode::TopPat,
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -421,8 +421,7 @@ fn token_name_eq(t1: &Token, t2: &Token) -> bool {`
`421`	`421`	`fn or_pat_mode(edition: Edition) -> OrPatNonterminalMode {`
`422`	`422`	`match edition {`
`423`	`423`	`Edition::Edition2015 \| Edition::Edition2018 => OrPatNonterminalMode::NoTopAlt,`
`424`		`- // FIXME(mark-i-m): uncomment this when edition 2021 machinery is added.`
`425`		`- // Edition::Edition2021 => OrPatNonterminalMode::TopPat,`
	`424`	`+ Edition::Edition2021 => OrPatNonterminalMode::TopPat,`
`426`	`425`	`}`
`427`	`426`	`}`
`428`	`427`