diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-04-16 01:16:44 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-04-16 01:18:07 +0530 |
| commit | 90c8d81ee4da99c59aba79e24aca257e81dbbbf1 (patch) | |
| tree | 8f5f45a4012b76f4431fa12fa2b37d6267573913 /src/libsyntax | |
| parent | fbbe85c6bafce59e1be4a966c1529f396bd546f0 (diff) | |
| parent | 01aebf01bc0cd0d95e02cc4c91059f02e4b03b13 (diff) | |
| download | rust-90c8d81ee4da99c59aba79e24aca257e81dbbbf1.tar.gz rust-90c8d81ee4da99c59aba79e24aca257e81dbbbf1.zip | |
Rollup merge of #32945 - durka:rfc1494, r=pnkfelix
implement RFC amendment 1494 Adds `:block` to the follow set for `:ty` and `:path`. See rust-lang/rfcs#1494.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 77bae4cb3f6..87ab3dad50c 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -1014,6 +1014,7 @@ fn is_in_follow(_: &ExtCtxt, tok: &Token, frag: &str) -> Result<bool, String> { match *tok { OpenDelim(token::DelimToken::Brace) | OpenDelim(token::DelimToken::Bracket) | Comma | FatArrow | Colon | Eq | Gt | Semi | BinOp(token::Or) => Ok(true), + MatchNt(_, ref frag, _, _) if frag.name.as_str() == "block" => Ok(true), Ident(i, _) if (i.name.as_str() == "as" || i.name.as_str() == "where") => Ok(true), _ => Ok(false) |