Detect NulInCStr error earlier.

nnethercote · nnethercote · commit 6001c50cac41 · 2024-01-12T16:19:37.000+11:00
By making it an `EscapeError` instead of a `LitError`. This makes it
like the other errors produced when checking string literals contents,
e.g. for invalid escape sequences or bare CR chars.

NOTE: this means these errors are issued earlier, before expansion,
which changes behaviour. It will be possible to move the check back to
the later point if desired. If that happens, it's likely that all the
string literal contents checks will be delayed together.

One nice thing about this: the old approach had some code in
`report_lit_error` to calculate the span of the nul char from a range.
This code used a hardwired `+2` to account for the `c"` at the start of
a C string literal, but this should have changed to a `+3` for raw C
string literals to account for the `cr"`, which meant that the caret in
`cr"` nul error messages was one short of where it should have been. The
new approach doesn't need any of this and avoids the off-by-one error.
diff --git a/crates/parser/src/lexed_str.rs b/crates/parser/src/lexed_str.rs
@@ -371,6 +371,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
`@@ -371,6 +371,7 @@ fn error_to_diagnostic_message(error: EscapeError, mode: Mode) -> &'static str {`
`371`	`371`	`"non-ASCII character in byte string literal"`
`372`	`372`	`}`
`373`	`373`	`EscapeError::NonAsciiCharInByte => "non-ASCII character in raw byte string literal",`
	`374`	`+ EscapeError::NulInCStr => "null character in C string literal",`
`374`	`375`	`EscapeError::UnskippedWhitespaceWarning => "",`
`375`	`376`	`EscapeError::MultipleSkippedLinesWarning => "",`
`376`	`377`	`}`
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`