don't print invalid labels with r#

Author: fee1-dead

compiler/rustc_parse/src/errors.rs

@@ -2232,7 +2232,7 @@ pub(crate) struct KeywordLifetime {
 pub(crate) struct InvalidLabel {
     #[primary_span]
     pub span: Span,
-    pub name: Symbol,
+    pub name: String,
 }
 
 #[derive(Diagnostic)]

compiler/rustc_parse/src/parser/expr.rs

@@ -3090,7 +3090,13 @@ impl<'a> Parser<'a> {
         if let Some((ident, is_raw)) = self.token.lifetime() {
             // Disallow `'fn`, but with a better error message than `expect_lifetime`.
             if matches!(is_raw, IdentIsRaw::No) && ident.without_first_quote().is_reserved() {
-                self.dcx().emit_err(errors::InvalidLabel { span: ident.span, name: ident.name });
+                self.dcx().emit_err(errors::InvalidLabel {
+                    span: ident.span,
+                    // `IntoDiagArg` prints the symbol as if it was an ident,
+                    // so `'break` is printed as `r#break`. We don't want that
+                    // here so convert to string eagerly.
+                    name: ident.without_first_quote().name.to_string(),
+                });
             }
 
             self.bump();

tests/ui/closures/issue-52437.rs

@@ -1,5 +1,5 @@
 fn main() {
     [(); &(&'static: loop { |x| {}; }) as *const _ as usize]
-    //~^ ERROR: invalid label name `'static`
+    //~^ ERROR: invalid label name `static`
     //~| ERROR: type annotations needed
 }

tests/ui/closures/issue-52437.stderr

@@ -1,4 +1,4 @@
-error: invalid label name `'static`
+error: invalid label name `static`
   --> $DIR/issue-52437.rs:2:13
    |
 LL |     [(); &(&'static: loop { |x| {}; }) as *const _ as usize]

tests/ui/issues/issue-46311.rs

@@ -1,4 +1,4 @@
 fn main() {
-    'break: loop { //~ ERROR invalid label name `'break`
+    'break: loop { //~ ERROR invalid label name `break`
     }
 }

tests/ui/issues/issue-46311.stderr

@@ -1,4 +1,4 @@
-error: invalid label name `'break`
+error: invalid label name `break`
   --> $DIR/issue-46311.rs:2:5
    |
 LL |     'break: loop {

tests/ui/label/label-static.rs

@@ -1,5 +1,5 @@
 fn main() {
-    'static: loop { //~ ERROR invalid label name `'static`
-        break 'static //~ ERROR invalid label name `'static`
+    'static: loop { //~ ERROR invalid label name `static`
+        break 'static //~ ERROR invalid label name `static`
     }
 }

tests/ui/label/label-static.stderr

@@ -1,10 +1,10 @@
-error: invalid label name `'static`
+error: invalid label name `static`
   --> $DIR/label-static.rs:2:5
    |
 LL |     'static: loop {
    |     ^^^^^^^
 
-error: invalid label name `'static`
+error: invalid label name `static`
   --> $DIR/label-static.rs:3:15
    |
 LL |         break 'static

tests/ui/label/label-underscore.rs

@@ -1,5 +1,5 @@
 fn main() {
-    '_: loop { //~ ERROR invalid label name `'_`
-        break '_ //~ ERROR invalid label name `'_`
+    '_: loop { //~ ERROR invalid label name `_`
+        break '_ //~ ERROR invalid label name `_`
     }
 }

tests/ui/label/label-underscore.stderr

@@ -1,10 +1,10 @@
-error: invalid label name `'_`
+error: invalid label name `_`
   --> $DIR/label-underscore.rs:2:5
    |
 LL |     '_: loop {
    |     ^^
 
-error: invalid label name `'_`
+error: invalid label name `_`
   --> $DIR/label-underscore.rs:3:15
    |
 LL |         break '_