Skip to content

Commit 1d0e0cb

Browse files
authored
Merge pull request rust-lang#18566 from lnicola/sync-from-rust
minor: Sync from downstream
2 parents 8d5e91c + d9df44f commit 1d0e0cb

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ tt = { path = "./crates/tt", version = "0.0.0" }
8484
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8585
vfs = { path = "./crates/vfs", version = "0.0.0" }
8686

87-
ra-ap-rustc_lexer = { version = "0.76", default-features = false }
88-
ra-ap-rustc_parse_format = { version = "0.76", default-features = false }
89-
ra-ap-rustc_index = { version = "0.76", default-features = false }
90-
ra-ap-rustc_abi = { version = "0.76", default-features = false }
91-
ra-ap-rustc_pattern_analysis = { version = "0.76", default-features = false }
87+
ra-ap-rustc_lexer = { version = "0.80", default-features = false }
88+
ra-ap-rustc_parse_format = { version = "0.80", default-features = false }
89+
ra-ap-rustc_index = { version = "0.80", default-features = false }
90+
ra-ap-rustc_abi = { version = "0.80", default-features = false }
91+
ra-ap-rustc_pattern_analysis = { version = "0.80", default-features = false }
9292

9393
# local crates that aren't published to crates.io. These should not have versions.
9494
test-fixture = { path = "./crates/test-fixture" }

crates/parser/src/lexed_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ impl<'a> Converter<'a> {
183183
rustc_lexer::TokenKind::Ident => {
184184
SyntaxKind::from_keyword(token_text, self.edition).unwrap_or(IDENT)
185185
}
186-
rustc_lexer::TokenKind::InvalidPrefix | rustc_lexer::TokenKind::InvalidIdent => {
186+
rustc_lexer::TokenKind::InvalidIdent => {
187187
err = "Ident contains invalid characters";
188188
IDENT
189189
}

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
145f9cf95de1fbde3fa11e98461310e0373253e6
1+
f005c7437def424a1c43cbc380352a58d8ac920b

0 commit comments

Comments
 (0)