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/ide/src/syntax_highlighting/test_data/highlight_doctest.html | |
| 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/ide/src/syntax_highlighting/test_data/highlight_doctest.html')
| -rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html index 396fd46fb..920956b51 100644 --- a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html | |||
| @@ -95,7 +95,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
| 95 | <span class="comment documentation">/// ```</span> | 95 | <span class="comment documentation">/// ```</span> |
| 96 | <span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="punctuation injected">(</span><span class="numeric_literal injected">1</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> | 96 | <span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="punctuation injected">(</span><span class="numeric_literal injected">1</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
| 97 | </span><span class="comment documentation">/// ```</span> | 97 | </span><span class="comment documentation">/// ```</span> |
| 98 | <span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span> | 98 | <span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span> |
| 99 | <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">></span> <span class="punctuation">{</span> | 99 | <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">></span> <span class="punctuation">{</span> |
| 100 | <span class="punctuation">$</span>expr | 100 | <span class="punctuation">$</span>expr |
| 101 | <span class="punctuation">}</span> | 101 | <span class="punctuation">}</span> |