about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-02-22 14:58:04 +0100
committerGitHub <noreply@github.com>2019-02-22 14:58:04 +0100
commitaa3779b4e97a94e2bac938cf7dead5d856af4d4a (patch)
tree84734fcbec823ec2029485183fd24183b8e4c79e /src/libsyntax/ext
parent94817aa87ab0902a978bf8cab6b8c66fe485dfea (diff)
parent65622e319e21d95bb7275109aecacb8e2526ce04 (diff)
downloadrust-aa3779b4e97a94e2bac938cf7dead5d856af4d4a.tar.gz
rust-aa3779b4e97a94e2bac938cf7dead5d856af4d4a.zip
Rollup merge of #58589 - matklad:remove-hack, r=petrochenkov
cleanup macro after 2018 transition

We can now use `?`
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/expand.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index d398437d7af..f50663f9785 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -36,10 +36,8 @@ macro_rules! ast_fragments {
     (
         $($Kind:ident($AstTy:ty) {
             $kind_name:expr;
-            // FIXME: HACK: this should be `$(one ...)?` and `$(many ...)?` but `?` macro
-            // repetition was removed from 2015 edition in #51587 because of ambiguities.
-            $(one fn $mut_visit_ast:ident; fn $visit_ast:ident;)*
-            $(many fn $flat_map_ast_elt:ident; fn $visit_ast_elt:ident;)*
+            $(one fn $mut_visit_ast:ident; fn $visit_ast:ident;)?
+            $(many fn $flat_map_ast_elt:ident; fn $visit_ast_elt:ident;)?
             fn $make_ast:ident;
         })*
     ) => {