fix raw string issue in diagnostics macro

Author: chenyukang

compiler/rustc_errors/src/translation.rs

@@ -65,10 +65,9 @@ pub trait Translate {
         trace!(?message, ?args);
         let (identifier, attr) = match message {
             DiagnosticMessage::Str(msg) | DiagnosticMessage::Eager(msg) => {
-                if args.iter().next().is_none() || (!msg.contains("$") && !msg.contains("`{")) {
-                    return Ok(Cow::Borrowed(msg));
-                } else {
-                    // FIXME(yukang): A hack for raw fluent content for new diagnostics proc format
+                // FIXME(yukang): A hack for raw fluent content for new diagnostics proc format
+                let trimed = msg.replace(" ", "");
+                if trimed.contains("$") || trimed.contains("{\"") || trimed.contains("\"}") {
                     let fluent_text = format!("dummy = {}", msg);
                     if let Ok(resource) = FluentResource::try_new(fluent_text) {
                         let mut bundle = RawFluentBundle::new(vec![langid!("en-US")]);
@@ -79,11 +78,9 @@ pub trait Translate {
                         return Ok(Cow::Owned(
                             res.to_string().replace("\u{2068}", "").replace("\u{2069}", ""),
                         ));
-                    } else {
-                        // If the message is not a valid Fluent resource, just return the original
-                        return Ok(Cow::Borrowed(msg));
                     }
                 }
+                return Ok(Cow::Borrowed(msg));
             }
             DiagnosticMessage::FluentIdentifier(identifier, attr) => (identifier, attr),
         };

compiler/rustc_macros/src/diagnostics/utils.rs

@@ -30,8 +30,14 @@ pub(crate) fn new_code_ident() -> syn::Ident {
 }
 
 pub(crate) fn convert_to_litstr(lit: &proc_macro2::Literal) -> LitStr {
-    let lit_content = format!("{}", lit);
-    LitStr::new(&lit_content[1..lit_content.len() - 1], lit.span())
+    let s = format!("{}", lit);
+    let s = if s.starts_with("r#\"") && s.ends_with("\"#") && s.len() >= 5 {
+        s[3..s.len() - 2].to_string()
+    } else {
+        s[1..s.len() - 1].to_string()
+    };
+
+    LitStr::new(&s, lit.span())
 }
 
 /// Checks whether the type name of `ty` matches `name`.

compiler/rustc_parse/src/errors.rs

@@ -317,10 +317,10 @@ pub(crate) struct FieldExpressionWithGeneric(#[primary_span] pub Span);
 pub(crate) struct MacroInvocationWithQualifiedPath(#[primary_span] pub Span);
 
 #[derive(Diagnostic)]
-#[diag("expected `while`, `for`, `loop` or `{` after a label")]
+#[diag(r#"expected `while`, `for`, `loop` or `{"{"}` after a label"#)]
 pub(crate) struct UnexpectedTokenAfterLabel {
     #[primary_span]
-    #[label("expected `while`, `for`, `loop` or `{` after a label")]
+    #[label(r#"expected `while`, `for`, `loop` or `{"{"}` after a label"#)]
     pub span: Span,
     #[suggestion(label = "consider removing the label", style = "verbose", code = "")]
     pub remove_label: Option<Span>,
@@ -532,7 +532,7 @@ pub(crate) struct ExpectedEqForLetExpr {
 }
 
 #[derive(Diagnostic)]
-#[diag(label = r#"expected `{"{"}`, found {$first_tok}"#)]
+#[diag(r#"expected `{"{"}`, found {$first_tok}"#)]
 pub(crate) struct ExpectedElseBlock {
     #[primary_span]
     pub first_tok_span: Span,
@@ -548,10 +548,10 @@ pub(crate) struct ExpectedElseBlock {
 }
 
 #[derive(Diagnostic)]
-#[diag(label = r#"expected one of `,`, `:`, or `{"}"}`, found `{$token}`"#)]
+#[diag(r#"expected one of `,`, `:`, or `{"}"}`, found `{$token}`"#)]
 pub(crate) struct ExpectedStructField {
     #[primary_span]
-    #[label("expected one of `,`, `:`, or `}`")]
+    #[label(r#"expected one of `,`, `:`, or `{"}"}`"#)]
     pub span: Span,
     pub token: Token,
     #[label("while parsing this struct field")]
@@ -651,7 +651,7 @@ pub(crate) struct CatchAfterTry {
 
 #[derive(Diagnostic)]
 #[diag("`gen` functions are not yet implemented")]
-#[help("for now you can use `gen {}` blocks and return `impl Iterator` instead")]
+#[help(r#"for now you can use `gen {"{}"}` blocks and return `impl Iterator` instead"#)]
 pub(crate) struct GenFn {
     #[primary_span]
     pub span: Span,
@@ -747,11 +747,11 @@ pub(crate) struct UseEqInstead {
 }
 
 #[derive(Diagnostic)]
-#[diag("expected `{}`, found `;`")]
+#[diag(r#"expected { "`{}`" }, found `;`"#)]
 pub(crate) struct UseEmptyBlockNotSemi {
     #[primary_span]
     #[suggestion(
-        label = "try using `{}` instead",
+        label = r#"try using { "`{}`" } instead"#,
         style = "hidden",
         applicability = "machine-applicable",
         code = "{{}}"
@@ -1086,7 +1086,7 @@ pub(crate) struct IncorrectVisibilityRestriction {
 }
 
 #[derive(Diagnostic)]
-#[diag("<assignment> ... else { ... } is not allowed")]
+#[diag(r#"<assignment> ... else {"{"} ... {"}"} is not allowed"#)]
 pub(crate) struct AssignmentElseNotAllowed {
     #[primary_span]
     pub span: Span,
@@ -1128,7 +1128,7 @@ pub(crate) struct InvalidExpressionInLetElse {
 }
 
 #[derive(Diagnostic)]
-#[diag("right curly brace `}` before `else` in a `let...else` statement not allowed")]
+#[diag(r#"right curly brace `{"}"}` before `else` in a `let...else` statement not allowed"#)]
 pub(crate) struct InvalidCurlyInLetElse {
     #[primary_span]
     pub span: Span,
@@ -1860,7 +1860,7 @@ pub struct UnexpectedTokenAfterDot<'a> {
 
 #[derive(Diagnostic)]
 #[diag("visibility `{$vis}` is not followed by an item")]
-#[help("you likely meant to define an item, e.g., `{$vis} fn foo() {\"{}\"}`")]
+#[help(r#"you likely meant to define an item, e.g., `{$vis} fn foo() {"{}"}`"#)]
 pub(crate) struct VisibilityNotFollowedByItem {
     #[primary_span]
     #[label("the visibility")]
@@ -2106,45 +2106,39 @@ pub(crate) struct EnumStructMutuallyExclusive {
 
 #[derive(Diagnostic)]
 pub(crate) enum UnexpectedTokenAfterStructName {
-    #[diag(
-        label = r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found reserved identifier `{$token}`"#
-    )]
+    #[diag(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found reserved identifier `{$token}`"#)]
     ReservedIdentifier {
         #[primary_span]
         #[label(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name"#)]
         span: Span,
         token: Token,
     },
     #[diag(
-        label = r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found keyword `{$token}`"#
+        r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found keyword `{$token}`"#
     )]
     Keyword {
         #[primary_span]
         #[label(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name"#)]
         span: Span,
         token: Token,
     },
-    #[diag(
-        label = r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found reserved keyword `{$token}`"#
-    )]
+    #[diag(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found reserved keyword `{$token}`"#)]
     ReservedKeyword {
         #[primary_span]
         #[label(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name"#)]
         span: Span,
         token: Token,
     },
     #[diag(
-        label = r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found doc comment `{$token}`"#
+        r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found doc comment `{$token}`"#
     )]
     DocComment {
         #[primary_span]
         #[label(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name"#)]
         span: Span,
         token: Token,
     },
-    #[diag(
-        label = r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found `{$token}`"#
-    )]
+    #[diag(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name, found `{$token}`"#)]
     Other {
         #[primary_span]
         #[label(r#"expected `where`, `{"{"}`, `(`, or `;` after struct name"#)]
@@ -2487,7 +2481,7 @@ pub enum UnescapeError {
     #[diag("unterminated unicode escape")]
     UnclosedUnicodeEscape(
         #[primary_span]
-        #[label("missing a closing `}`")]
+        #[label(r#"missing a closing `{"}"}`"#)]
         Span,
         #[suggestion(
             label = "terminate the unicode escape",
@@ -2630,7 +2624,7 @@ pub enum NoBraceUnicodeSub {
         span: Span,
         suggestion: String,
     },
-    #[help(r#"format of unicode escape sequences is `\u{...}`"#)]
+    #[help(r#"format of unicode escape sequences is `\u{"{...}"}`"#)]
     Help,
 }
 
@@ -2952,7 +2946,7 @@ pub(crate) struct InvalidDynKeyword {
 
 #[derive(Subdiagnostic)]
 pub enum HelpUseLatestEdition {
-    #[help("set `edition = \"{$edition}\"` in `Cargo.toml`")]
+    #[help(r#"set `edition = "{$edition}"` in `Cargo.toml`"#)]
     #[note("for more on editions, read https://doc.rust-lang.org/edition-guide")]
     Cargo { edition: Edition },
     #[help("pass `--edition {$edition}` to `rustc`")]
@@ -3261,7 +3255,7 @@ pub(crate) struct FunctionBodyEqualsExpr {
 
 #[derive(Subdiagnostic)]
 #[multipart_suggestion(
-    label = "surround the expression with `{` and `}` instead of `=` and `;`",
+    label = r#"surround the expression with `{"{"}` and `{"}"}` instead of `=` and `;`"#,
     applicability = "machine-applicable"
 )]
 pub(crate) struct FunctionBodyEqualsExprSugg {