diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-15 14:45:09 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-15 14:45:09 +0000 |
| commit | bd4c352831662762ee7a66da77ec9adf623b0a0a (patch) | |
| tree | 725dfad20b95344ad363b35860cf7e57067bb5e5 /crates/syntax/test_data/parser/inline/ok | |
| parent | 39aae835fd70d06092c1be1add6eef3984439529 (diff) | |
| parent | 479babf8740a4d3cf6fc03a5f4a2fca00d387501 (diff) | |
Merge #6893
6893: Move to upstream `macro_rules!` model r=matklad a=jonas-schievink
This changes `macro_rules!` from being treated as a macro invocation to being a first-class item. It also disallows using an additional ident argument for regular macros, so `m! ident(...);` now fails to parse.
This matches upstream Rust, and makes the code somewhat simpler by removing repeated "is this a `macro_rules!` call" checks. It will also simplify allowing visibilities on macros, which is currently being proposed in https://github.com/rust-lang/rust/pull/78166.
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/syntax/test_data/parser/inline/ok')
3 files changed, 26 insertions, 36 deletions
diff --git a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast index de8217064..e4fb32de1 100644 --- a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast +++ b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast | |||
| @@ -12,11 +12,8 @@ [email protected] | |||
| 12 | [email protected] "{" | 12 | [email protected] "{" |
| 13 | [email protected] "}" | 13 | [email protected] "}" |
| 14 | [email protected] "\n" | 14 | [email protected] "\n" |
| 15 | [email protected] | 15 | [email protected] |
| 16 | [email protected] | 16 | [email protected] "macro_rules" |
| 17 | [email protected] | ||
| 18 | [email protected] | ||
| 19 | [email protected] "macro_rules" | ||
| 20 | [email protected] "!" | 17 | [email protected] "!" |
| 21 | [email protected] " " | 18 | [email protected] " " |
| 22 | [email protected] | 19 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast index e757249f0..e84b9164f 100644 --- a/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast +++ b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast | |||
| @@ -82,32 +82,28 @@ [email protected] | |||
| 82 | [email protected] "{" | 82 | [email protected] "{" |
| 83 | [email protected] "}" | 83 | [email protected] "}" |
| 84 | [email protected] "\n " | 84 | [email protected] "\n " |
| 85 | [email protected] | 85 | [email protected] |
| 86 | [email protected] | 86 | [email protected] "macro_rules" |
| 87 | [email protected] | 87 | [email protected] "!" |
| 88 | [email protected] | 88 | [email protected] " " |
| 89 | [email protected] | 89 | [email protected] |
| 90 | [email protected] "macro_rules" | 90 | [email protected] "test" |
| 91 | [email protected] "!" | 91 | [email protected] " " |
| 92 | [email protected] " " | 92 | [email protected] |
| 93 | [email protected] | 93 | [email protected] "{" |
| 94 | [email protected] "test" | 94 | [email protected] "\n " |
| 95 | [email protected] " " | 95 | [email protected] |
| 96 | [email protected] | 96 | [email protected] "(" |
| 97 | [email protected] "{" | 97 | [email protected] ")" |
| 98 | [email protected] "\n " | 98 | [email protected] " " |
| 99 | [email protected] | 99 | [email protected] "=" |
| 100 | [email protected] "(" | 100 | [email protected] ">" |
| 101 | [email protected] ")" | 101 | [email protected] " " |
| 102 | [email protected] " " | 102 | [email protected] |
| 103 | [email protected] "=" | 103 | [email protected] "{" |
| 104 | [email protected] ">" | 104 | [email protected] "}" |
| 105 | [email protected] " " | 105 | [email protected] "\n " |
| 106 | [email protected] | 106 | [email protected] "}" |
| 107 | [email protected] "{" | ||
| 108 | [email protected] "}" | ||
| 109 | [email protected] "\n " | ||
| 110 | [email protected] "}" | ||
| 111 | [email protected] "\n " | 107 | [email protected] "\n " |
| 112 | [email protected] | 108 | [email protected] |
| 113 | [email protected] | 109 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast index 05b89d1c3..d1c22947b 100644 --- a/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast +++ b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | [email protected] | 1 | [email protected] |
| 2 | [email protected] | 2 | [email protected] |
| 3 | [email protected] | 3 | [email protected] "macro_rules" |
| 4 | [email protected] | ||
| 5 | [email protected] | ||
| 6 | [email protected] "macro_rules" | ||
| 7 | [email protected] "!" | 4 | [email protected] "!" |
| 8 | [email protected] " " | 5 | [email protected] " " |
| 9 | [email protected] | 6 | [email protected] |