Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit d289c13

Browse files
"Fix" r-a lexer support for raw lifetimes
1 parent bb51fb3 commit d289c13

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/tools/rust-analyzer/crates/parser/src/lexed_str.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,14 @@ impl<'a> Converter<'a> {
209209
}
210210
LIFETIME_IDENT
211211
}
212+
rustc_lexer::TokenKind::UnknownPrefixLifetime => {
213+
err = "Unknown lifetime prefix";
214+
LIFETIME_IDENT
215+
}
216+
rustc_lexer::TokenKind::RawLifetimePrefix => {
217+
err = "Unsupported raw lifetime";
218+
LIFETIME_IDENT
219+
}
212220

213221
rustc_lexer::TokenKind::Semi => T![;],
214222
rustc_lexer::TokenKind::Comma => T![,],

src/tools/rustfmt/src/macros.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,9 @@ fn next_space(tok: &TokenKind) -> SpaceState {
10981098
| TokenKind::OpenDelim(_)
10991099
| TokenKind::CloseDelim(_) => SpaceState::Never,
11001100

1101-
TokenKind::Literal(..) | TokenKind::Ident(..) | TokenKind::Lifetime(..) => SpaceState::Ident,
1101+
TokenKind::Literal(..) | TokenKind::Ident(..) | TokenKind::Lifetime(..) => {
1102+
SpaceState::Ident
1103+
}
11021104

11031105
_ => SpaceState::Always,
11041106
}

0 commit comments

Comments
 (0)