diff --git a/src/libsyntax/parse/unescape_error_reporting.rs b/src/libsyntax/parse/unescape_error_reporting.rs index 7eee07e61a95d..5565015179c2d 100644 --- a/src/libsyntax/parse/unescape_error_reporting.rs +++ b/src/libsyntax/parse/unescape_error_reporting.rs @@ -47,6 +47,12 @@ pub(crate) fn emit_unescape_error( .emit(); } EscapeError::MoreThanOneChar => { + let msg = if mode.is_bytes() { + "if you meant to write a byte string literal, use double quotes" + } else { + "if you meant to write a `str` literal, use double quotes" + }; + handler .struct_span_err( span_with_quotes, @@ -54,7 +60,7 @@ pub(crate) fn emit_unescape_error( ) .span_suggestion( span_with_quotes, - "if you meant to write a `str` literal, use double quotes", + msg, format!("\"{}\"", lit), Applicability::MachineApplicable, ).emit() diff --git a/src/test/ui/issues/issue-64732.rs b/src/test/ui/issues/issue-64732.rs new file mode 100644 index 0000000000000..2db51ea6042aa --- /dev/null +++ b/src/test/ui/issues/issue-64732.rs @@ -0,0 +1,9 @@ +#![allow(unused)] +fn main() { + let _foo = b'hello\0'; + //~^ ERROR character literal may only contain one codepoint + //~| HELP if you meant to write a byte string literal, use double quotes + let _bar = 'hello'; + //~^ ERROR character literal may only contain one codepoint + //~| HELP if you meant to write a `str` literal, use double quotes +} diff --git a/src/test/ui/issues/issue-64732.stderr b/src/test/ui/issues/issue-64732.stderr new file mode 100644 index 0000000000000..fc0e8e3bdb20f --- /dev/null +++ b/src/test/ui/issues/issue-64732.stderr @@ -0,0 +1,22 @@ +error: character literal may only contain one codepoint + --> $DIR/issue-64732.rs:3:17 + | +LL | let _foo = b'hello\0'; + | ^^^^^^^^^ +help: if you meant to write a byte string literal, use double quotes + | +LL | let _foo = b"hello\0"; + | ^^^^^^^^^ + +error: character literal may only contain one codepoint + --> $DIR/issue-64732.rs:6:16 + | +LL | let _bar = 'hello'; + | ^^^^^^^ +help: if you meant to write a `str` literal, use double quotes + | +LL | let _bar = "hello"; + | ^^^^^^^ + +error: aborting due to 2 previous errors +