diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-20 14:24:07 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-20 14:24:07 +0100 |
| commit | c73399365867178523885d0c997844d0d2d33325 (patch) | |
| tree | 1d070a71dca05a04fc92d2b4f52163357ea797d1 /crates/ra_parser/src/grammar | |
| parent | b19da133eec13ac8943b708d17410e3a8a6b6193 (diff) | |
| parent | 0f70290b6ee4cd0c8dbca90f78c9c121ef71c126 (diff) | |
Merge #1881
1881: don't confuse macro with != r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar')
| -rw-r--r-- | crates/ra_parser/src/grammar/types.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs index bd3829f41..4e3522d48 100644 --- a/crates/ra_parser/src/grammar/types.rs +++ b/crates/ra_parser/src/grammar/types.rs | |||
| @@ -256,7 +256,7 @@ fn path_or_macro_type_(p: &mut Parser, allow_bounds: bool) { | |||
| 256 | let m = p.start(); | 256 | let m = p.start(); |
| 257 | paths::type_path(p); | 257 | paths::type_path(p); |
| 258 | 258 | ||
| 259 | let kind = if p.at(T![!]) { | 259 | let kind = if p.at(T![!]) && !p.at(T![!=]) { |
| 260 | items::macro_call_after_excl(p); | 260 | items::macro_call_after_excl(p); |
| 261 | MACRO_CALL | 261 | MACRO_CALL |
| 262 | } else { | 262 | } else { |