diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-16 17:08:03 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-16 17:08:03 +0000 |
| commit | 067067a6c11bb5afda98f5af14bfdec4744e7812 (patch) | |
| tree | 1c0b6c4c78ee040ebdf818dada804fce311382a6 /crates/mbe/src/mbe_expander/matcher.rs | |
| parent | 63bbdb31e5148c804bbf940963c9c8f3481ad258 (diff) | |
| parent | dd496223f50232fe98312ee8edc89eb4b5ee3d85 (diff) | |
Merge #6896
6896: Node-ify lifetimes r=jonas-schievink a=Veykril
Let's see if this passes the tests 🤞
Depends on https://github.com/rust-analyzer/ungrammar/pull/15
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/mbe/src/mbe_expander/matcher.rs')
| -rw-r--r-- | crates/mbe/src/mbe_expander/matcher.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs index 93ee77908..7aeef7be5 100644 --- a/crates/mbe/src/mbe_expander/matcher.rs +++ b/crates/mbe/src/mbe_expander/matcher.rs | |||
| @@ -295,7 +295,7 @@ impl<'a> TtIter<'a> { | |||
| 295 | 295 | ||
| 296 | impl<'a> TreeSink for OffsetTokenSink<'a> { | 296 | impl<'a> TreeSink for OffsetTokenSink<'a> { |
| 297 | fn token(&mut self, kind: SyntaxKind, mut n_tokens: u8) { | 297 | fn token(&mut self, kind: SyntaxKind, mut n_tokens: u8) { |
| 298 | if kind == SyntaxKind::LIFETIME { | 298 | if kind == SyntaxKind::LIFETIME_IDENT { |
| 299 | n_tokens = 2; | 299 | n_tokens = 2; |
| 300 | } | 300 | } |
| 301 | for _ in 0..n_tokens { | 301 | for _ in 0..n_tokens { |