nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 11:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

trpl: fix macro follow sets

Browse Source
This commit is contained in:
Alex Burka 2016-01-27 13:26:47 -05:00
parent 8256c470a5
commit fd4d013a2c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/doc/book/macros.md
View File

@ -478,9 +478,9 @@ which syntactic form it matches.
There are additional rules regarding the next token after a metavariable: There are additional rules regarding the next token after a metavariable:
* `expr` variables may only be followed by one of: `=> , ;` * `expr` and `stmt` variables may only be followed by one of: `=> , ;`
* `ty` and `path` variables may only be followed by one of: `=> , : = > as` * `ty` and `path` variables may only be followed by one of: `=> , = | ; : > [ { as where`
* `pat` variables may only be followed by one of: `=> , = if in` * `pat` variables may only be followed by one of: `=> , = | if in`
* Other variables may be followed by any token. * Other variables may be followed by any token.
These rules provide some flexibility for Rust’s syntax to evolve without These rules provide some flexibility for Rust’s syntax to evolve without

1
src/libsyntax/ext/tt/macro_rules.rs
View File

@ -972,6 +972,7 @@ fn can_be_followed_by_any(frag: &str) -> bool {
/// we expanded `expr` to include a new binary operator, we might /// we expanded `expr` to include a new binary operator, we might
/// break macros that were relying on that binary operator as a /// break macros that were relying on that binary operator as a
/// separator. /// separator.
// when changing this do not forget to update doc/book/macros.md!
fn is_in_follow(_: &ExtCtxt, tok: &Token, frag: &str) -> Result<bool, String> { fn is_in_follow(_: &ExtCtxt, tok: &Token, frag: &str) -> Result<bool, String> {
if let &CloseDelim(_) = tok { if let &CloseDelim(_) = tok {
// closing a token tree can never be matched by any fragment; // closing a token tree can never be matched by any fragment;