diff options
| author | bors <bors@rust-lang.org> | 2016-01-26 07:42:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-26 07:42:10 +0000 |
| commit | acf4aeeda06b5355060e3dd8316e096465242f94 (patch) | |
| tree | 812b6e0d57a0f74ed7e698db3133b8d86615b314 /src/libsyntax/ext | |
| parent | faf6d1e87391b25196b35909c3c95e5d873cacf0 (diff) | |
| parent | 79157b3fb5d534500caf9c5f2a40161bea01e79d (diff) | |
| download | rust-acf4aeeda06b5355060e3dd8316e096465242f94.tar.gz rust-acf4aeeda06b5355060e3dd8316e096465242f94.zip | |
Auto merge of #31210 - Manishearth:rollup, r=Manishearth
- Successful merges: #31152, #31184, #31189, #31192, #31197, #31199, #31201 - Failed merges:
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 2 |
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), |