mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #31240 - durka:follow-set-docs, r=pnkfelix

Browse Source 
Missed as part of #31152, but the list had other mistakes as well.

r? @pnkfelix
This commit is contained in:
bors 2016-01-28 07:06:29 +00:00
commit 035f4cca00
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:
* `expr` variables may only be followed by one of: `=> , ;`
* `ty` and `path` variables may only be followed by one of: `=> , : = > as`
* `pat` variables may only be followed by one of: `=> , = if in`
* `expr` and `stmt` variables may only be followed by one of: `=> , ;`
* `ty` and `path` variables may only be followed by one of: `=> , = | ; : > [ { as where`
* `pat` variables may only be followed by one of: `=> , = | if in`
* Other variables may be followed by any token.
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
/// break macros that were relying on that binary operator as a
/// 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> {
if let &CloseDelim(_) = tok {
// closing a token tree can never be matched by any fragment;