Skip to content

Commit 38f7a34

Browse files
committed
Auto merge of #16426 - lnicola:bump-rustc, r=lnicola
minor: Bump rustc crates This also reverts the earlier revert.
2 parents 0d52934 + ea94c10 commit 38f7a34

File tree

4 files changed

+20
-39
lines changed

4 files changed

+20
-39
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ tt = { path = "./crates/tt", version = "0.0.0" }
7979
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8080
vfs = { path = "./crates/vfs", version = "0.0.0" }
8181

82-
ra-ap-rustc_lexer = { version = "0.21.0", default-features = false }
83-
ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
84-
ra-ap-rustc_index = { version = "0.21.0", default-features = false }
85-
ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
82+
ra-ap-rustc_lexer = { version = "0.33.0", default-features = false }
83+
ra-ap-rustc_parse_format = { version = "0.33.0", default-features = false }
84+
ra-ap-rustc_index = { version = "0.33.0", default-features = false }
85+
ra-ap-rustc_abi = { version = "0.33.0", default-features = false }
8686
ra-ap-rustc_pattern_analysis = { version = "0.33.0", default-features = false }
8787

8888
# local crates that aren't published to crates.io. These should not have versions.

crates/parser/src/lexed_str.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ fn error_to_diagnostic_message(error: EscapeError, mode: Mode) -> &'static str {
369369
"non-ASCII character in byte string literal"
370370
}
371371
EscapeError::NonAsciiCharInByte => "non-ASCII character in raw byte string literal",
372+
EscapeError::NulInCStr => "null character in C string literal",
372373
EscapeError::UnskippedWhitespaceWarning => "",
373374
EscapeError::MultipleSkippedLinesWarning => "",
374375
}

crates/syntax/src/validation.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ fn rustc_unescape_error_to_string(err: unescape::EscapeError) -> (&'static str,
106106
EE::NonAsciiCharInByte => {
107107
"Byte literals must not contain non-ASCII characters"
108108
}
109+
EE::NulInCStr => {
110+
"C strings literals must not contain null characters"
111+
}
109112
EE::UnskippedWhitespaceWarning => "Whitespace after this escape is not skipped",
110113
EE::MultipleSkippedLinesWarning => "Multiple lines are skipped by this escape",
111114

0 commit comments

Comments
 (0)