Merge pull request #931 from dtolnay/constblock-pat

Parse const blocks in pattern position
dtolnay · Nov 27, 2020 · cf110e3 · cf110e3
2 parents 80cbd3f + 98a5e9b
commit cf110e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/pat.rs b/src/pat.rs
@@ -343,6 +343,8 @@ pub mod parsing {
                 input.call(pat_slice).map(Pat::Slice)
             } else if lookahead.peek(Token![..]) && !input.peek(Token![...]) {
                 pat_range_half_open(input, begin)
+            } else if lookahead.peek(Token![const]) {
+                input.call(pat_const).map(Pat::Verbatim)
             } else {
                 Err(lookahead.error())
             }
@@ -690,6 +692,18 @@ pub mod parsing {
         })
     }
 
+    fn pat_const(input: ParseStream) -> Result<TokenStream> {
+        let begin = input.fork();
+        input.parse::<Token![const]>()?;
+
+        let content;
+        braced!(content in input);
+        content.call(Attribute::parse_inner)?;
+        content.call(Block::parse_within)?;
+
+        Ok(verbatim::between(begin, input))
+    }
+
     pub fn multi_pat(input: ParseStream) -> Result<Pat> {
         multi_pat_impl(input, None)
     }

diff --git a/tests/repo/mod.rs b/tests/repo/mod.rs
@@ -12,9 +12,8 @@ const REVISION: &str = "9d78d1d02761b906038ba4d54c5f3427f920f5fb";
 
 #[rustfmt::skip]
 static EXCLUDE: &[&str] = &[
-    // TODO: const block in pattern position (#921)
+    // TODO: const block in range patterns (#921)
     "src/test/ui/inline-const/const-match-pat-range.rs",
-    "src/test/ui/inline-const/const-match-pat.rs",
 
     // Compile-fail expr parameter in const generic position: f::<1 + 2>()
     "src/test/ui/const-generics/closing-args-token.rs",