about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2016-01-26 13:11:57 +0530
committerManish Goregaokar <manishsmail@gmail.com>2016-01-26 13:11:57 +0530
commitb46bd2fb292dbd5bca8c147074a5528b3906328e (patch)
tree3f10c41ef925ecfddf890e37bc1025a74d4f0c5f /src/libsyntax
parentfaf6d1e87391b25196b35909c3c95e5d873cacf0 (diff)
parente1e0de86ec7ae5c572560a39282b54b410b49f83 (diff)
downloadrust-b46bd2fb292dbd5bca8c147074a5528b3906328e.tar.gz
rust-b46bd2fb292dbd5bca8c147074a5528b3906328e.zip
Rollup merge of #31152 - durka:ty-follow-bracket, r=pnkfelix
cc #31135 rust-lang/rfcs#1462 #30923 @retep998
r? @pnkfelix
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/tt/macro_rules.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
index 9f069cb17ed..bfd76db0359 100644
--- a/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@ -1005,7 +1005,7 @@ fn is_in_follow(_: &ExtCtxt, tok: &Token, frag: &str) -> Result<bool, String> {
             },
             "path" | "ty" => {
                 match *tok {
-                    OpenDelim(token::DelimToken::Brace) |
+                    OpenDelim(token::DelimToken::Brace) | OpenDelim(token::DelimToken::Bracket) |
                     Comma | FatArrow | Colon | Eq | Gt | Semi | BinOp(token::Or) => Ok(true),
                     Ident(i, _) if (i.name.as_str() == "as" ||
                                     i.name.as_str() == "where") => Ok(true),