Auto merge of #16426 - lnicola:bump-rustc, r=lnicola

bors · bors · commit 38f7a3498e0d · 2024-01-25T04:49:36.000Z
minor: Bump rustc crates

This also reverts the earlier revert.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -79,10 +79,10 @@ 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.21.0", default-features = false }
-ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
-ra-ap-rustc_index = { version = "0.21.0", default-features = false }
-ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
+ra-ap-rustc_lexer = { version = "0.33.0", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.33.0", default-features = false }
+ra-ap-rustc_index = { version = "0.33.0", default-features = false }
+ra-ap-rustc_abi = { version = "0.33.0", default-features = false }
 ra-ap-rustc_pattern_analysis = { version = "0.33.0", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
diff --git a/crates/parser/src/lexed_str.rs b/crates/parser/src/lexed_str.rs
@@ -369,6 +369,7 @@ fn error_to_diagnostic_message(error: EscapeError, mode: Mode) -> &'static str {
             "non-ASCII character in byte string literal"
         }
         EscapeError::NonAsciiCharInByte => "non-ASCII character in raw byte string literal",
+        EscapeError::NulInCStr => "null character in C string literal",
         EscapeError::UnskippedWhitespaceWarning => "",
         EscapeError::MultipleSkippedLinesWarning => "",
     }
diff --git a/crates/syntax/src/validation.rs b/crates/syntax/src/validation.rs
@@ -106,6 +106,9 @@ fn rustc_unescape_error_to_string(err: unescape::EscapeError) -> (&'static str,
         EE::NonAsciiCharInByte  => {
             "Byte literals must not contain non-ASCII characters"
         }
+        EE::NulInCStr  => {
+            "C strings literals must not contain null characters"
+        }
         EE::UnskippedWhitespaceWarning => "Whitespace after this escape is not skipped",
         EE::MultipleSkippedLinesWarning => "Multiple lines are skipped by this escape",
 

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ fn error_to_diagnostic_message(error: EscapeError, mode: Mode) -> &'static str {`
`369`	`369`	`"non-ASCII character in byte string literal"`
`370`	`370`	`}`
`371`	`371`	`EscapeError::NonAsciiCharInByte => "non-ASCII character in raw byte string literal",`
	`372`	`+ EscapeError::NulInCStr => "null character in C string literal",`
`372`	`373`	`EscapeError::UnskippedWhitespaceWarning => "",`
`373`	`374`	`EscapeError::MultipleSkippedLinesWarning => "",`
`374`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ fn rustc_unescape_error_to_string(err: unescape::EscapeError) -> (&'static str,`
`106`	`106`	`EE::NonAsciiCharInByte => {`
`107`	`107`	`"Byte literals must not contain non-ASCII characters"`
`108`	`108`	`}`
	`109`	`+ EE::NulInCStr => {`
	`110`	`+ "C strings literals must not contain null characters"`
	`111`	`+ }`
`109`	`112`	`EE::UnskippedWhitespaceWarning => "Whitespace after this escape is not skipped",`
`110`	`113`	`EE::MultipleSkippedLinesWarning => "Multiple lines are skipped by this escape",`
`111`	`114`