Merge pull request #18566 from lnicola/sync-from-rust

minor: Sync from downstream
rust-lang · Nov 28, 2024 · 1d0e0cb · 1d0e0cb
2 parents 8d5e91c + d9df44f
commit 1d0e0cb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -84,11 +84,11 @@ tt = { path = "./crates/tt", version = "0.0.0" }
 vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 
-ra-ap-rustc_lexer = { version = "0.76", default-features = false }
-ra-ap-rustc_parse_format = { version = "0.76", default-features = false }
-ra-ap-rustc_index = { version = "0.76", default-features = false }
-ra-ap-rustc_abi = { version = "0.76", default-features = false }
-ra-ap-rustc_pattern_analysis = { version = "0.76", default-features = false }
+ra-ap-rustc_lexer = { version = "0.80", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.80", default-features = false }
+ra-ap-rustc_index = { version = "0.80", default-features = false }
+ra-ap-rustc_abi = { version = "0.80", default-features = false }
+ra-ap-rustc_pattern_analysis = { version = "0.80", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 test-fixture = { path = "./crates/test-fixture" }

diff --git a/crates/parser/src/lexed_str.rs b/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
                 }

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-145f9cf95de1fbde3fa11e98461310e0373253e6
+f005c7437def424a1c43cbc380352a58d8ac920b
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		145f9cf95de1fbde3fa11e98461310e0373253e6
		f005c7437def424a1c43cbc380352a58d8ac920b