diff options
| author | bors <bors@rust-lang.org> | 2024-11-19 23:04:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-19 23:04:44 +0000 |
| commit | 875df370be806c837f58abb638329905e969ace4 (patch) | |
| tree | e58327bc327f3c89302c8bec41621e87ffa96838 /src/tools/rust-analyzer | |
| parent | ee612c45f00391aff71ec0c52b7fc08fae18c711 (diff) | |
| parent | 2467654917affe354b6b5fc4fae464c07ecbf2e9 (diff) | |
| download | rust-875df370be806c837f58abb638329905e969ace4.tar.gz rust-875df370be806c837f58abb638329905e969ace4.zip | |
Auto merge of #133219 - matthiaskrgr:rollup-hnuq0zf, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #123947 (Add vec_deque::Iter::as_slices and friends) - #125405 (Add std::thread::add_spawn_hook.) - #133175 (ci: use free runner in dist-i686-msvc) - #133183 (Mention std::fs::remove_dir_all in std::fs::remove_dir) - #133188 (Add `visit` methods to ast nodes that already have `walk`s on ast visitors) - #133201 (Remove `TokenKind::InvalidPrefix`) - #133207 (Default-enable `llvm_tools_enabled` when no `config.toml` is present) - #133213 (Correct the tier listing of `wasm32-wasip2`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools/rust-analyzer')
| -rw-r--r-- | src/tools/rust-analyzer/crates/parser/src/lexed_str.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/crates/parser/src/lexed_str.rs b/src/tools/rust-analyzer/crates/parser/src/lexed_str.rs index 3c0eb1b42a6..c97596d5097 100644 --- a/src/tools/rust-analyzer/crates/parser/src/lexed_str.rs +++ b/src/tools/rust-analyzer/crates/parser/src/lexed_str.rs @@ -183,7 +183,7 @@ impl<'a> Converter<'a> { rustc_lexer::TokenKind::Ident => { SyntaxKind::from_keyword(token_text, self.edition).unwrap_or(IDENT) } - rustc_lexer::TokenKind::InvalidPrefix | rustc_lexer::TokenKind::InvalidIdent => { + rustc_lexer::TokenKind::InvalidIdent => { err = "Ident contains invalid characters"; IDENT } |