fix diagnostic derive

Author: chenyukang

compiler/rustc_macros/src/diagnostics/subdiagnostic.rs

@@ -202,7 +202,7 @@ impl<'parent, 'a> SubdiagnosticDeriveVariantBuilder<'parent, 'a> {
                 (None, None) => {
                     throw_span_err!(
                         attr.span().unwrap(),
-                        "diagnostic slug or raw_label must be first argument of a `#[{name}(...)]` attribute"
+                        "diagnostic slug or raw_label must be first argument of a attribute"
                     );
                 }
                 (Some(_), Some(_)) => {

tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs

@@ -44,9 +44,9 @@ struct HelloWarn {}
 //~^ ERROR unsupported type attribute for diagnostic derive enum
 enum DiagnosticOnEnum {
     Foo,
-    //~^ ERROR diagnostic slug not specified
+    //~^ ERROR diagnostic slug or label is not specified
     Bar,
-    //~^ ERROR diagnostic slug not specified
+    //~^ ERROR diagnostic slug or label is not specified
 }
 
 #[derive(Diagnostic)]
@@ -58,13 +58,12 @@ struct WrongStructAttrStyle {}
 #[derive(Diagnostic)]
 #[nonsense(no_crate_example, code = "E0123")]
 //~^ ERROR `#[nonsense(...)]` is not a valid attribute
-//~^^ ERROR diagnostic slug not specified
+//~^^ ERROR diagnostic slug or label is not specified
 //~^^^ ERROR cannot find attribute `nonsense` in this scope
 struct InvalidStructAttr {}
 
 #[derive(Diagnostic)]
 #[diag("E0123")]
-//~^ ERROR diagnostic slug not specified
 struct InvalidLitNestedAttr {}
 
 #[derive(Diagnostic)]
@@ -74,20 +73,20 @@ struct InvalidNestedStructAttr {}
 
 #[derive(Diagnostic)]
 #[diag(nonsense("foo"), code = "E0123", slug = "foo")]
-//~^ ERROR diagnostic slug must be the first argument
-//~| ERROR diagnostic slug not specified
+//~^ ERROR diagnostic slug or label is not specified
+//~| ERROR diagnostic slug must be the first argument
 struct InvalidNestedStructAttr1 {}
 
 #[derive(Diagnostic)]
 #[diag(nonsense = "...", code = "E0123", slug = "foo")]
 //~^ ERROR unknown argument
-//~| ERROR diagnostic slug not specified
+//~| ERROR diagnostic slug or label is not specified
 struct InvalidNestedStructAttr2 {}
 
 #[derive(Diagnostic)]
 #[diag(nonsense = 4, code = "E0123", slug = "foo")]
 //~^ ERROR unknown argument
-//~| ERROR diagnostic slug not specified
+//~| ERROR diagnostic slug or label is not specified
 struct InvalidNestedStructAttr3 {}
 
 #[derive(Diagnostic)]
@@ -121,11 +120,11 @@ struct CodeSpecifiedTwice {}
 struct SlugSpecifiedTwice {}
 
 #[derive(Diagnostic)]
-struct KindNotProvided {} //~ ERROR diagnostic slug not specified
+struct KindNotProvided {} //~ ERROR diagnostic slug or label is not specified
 
 #[derive(Diagnostic)]
 #[diag(code = "E0456")]
-//~^ ERROR diagnostic slug not specified
+//~^ ERROR diagnostic slug or label is not specified
 struct SlugNotProvided {}
 
 #[derive(Diagnostic)]
@@ -578,21 +577,21 @@ struct ErrorWithWarn {
 #[derive(Diagnostic)]
 #[error(no_crate_example, code = "E0123")]
 //~^ ERROR `#[error(...)]` is not a valid attribute
-//~| ERROR diagnostic slug not specified
+//~| ERROR diagnostic slug or label is not specified
 //~| ERROR cannot find attribute `error` in this scope
 struct ErrorAttribute {}
 
 #[derive(Diagnostic)]
 #[warn_(no_crate_example, code = "E0123")]
 //~^ ERROR `#[warn_(...)]` is not a valid attribute
-//~| ERROR diagnostic slug not specified
+//~| ERROR diagnostic slug or label is not specified
 //~| ERROR cannot find attribute `warn_` in this scope
 struct WarnAttribute {}
 
 #[derive(Diagnostic)]
 #[lint(no_crate_example, code = "E0123")]
 //~^ ERROR `#[lint(...)]` is not a valid attribute
-//~| ERROR diagnostic slug not specified
+//~| ERROR diagnostic slug or label is not specified
 //~| ERROR cannot find attribute `lint` in this scope
 struct LintAttributeOnSessionDiag {}
 

tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr

@@ -4,30 +4,30 @@ error: unsupported type attribute for diagnostic derive enum
 LL | #[diag(no_crate_example, code = "E0123")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: diagnostic slug not specified
-  --> $DIR/diagnostic-derive.rs:46:5
+error: diagnostic slug or label is not specified
+  --> $DIR/diagnostic-derive.rs:47:5
    |
 LL |     Foo,
    |     ^^^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
-error: diagnostic slug not specified
-  --> $DIR/diagnostic-derive.rs:48:5
+error: diagnostic slug or label is not specified
+  --> $DIR/diagnostic-derive.rs:49:5
    |
 LL |     Bar,
    |     ^^^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: `#[nonsense(...)]` is not a valid attribute
   --> $DIR/diagnostic-derive.rs:59:1
    |
 LL | #[nonsense(no_crate_example, code = "E0123")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: diagnostic slug not specified
-  --> $DIR/diagnostic-derive.rs:59:1
+error: diagnostic slug or label is not specified
+  --> $DIR/diagnostic-derive.rs:60:1
    |
 LL | / #[nonsense(no_crate_example, code = "E0123")]
 LL | |
@@ -36,25 +36,15 @@ LL | |
 LL | | struct InvalidStructAttr {}
    | |___________________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
-
-error: diagnostic slug not specified
-  --> $DIR/diagnostic-derive.rs:66:1
-   |
-LL | / #[diag("E0123")]
-LL | |
-LL | | struct InvalidLitNestedAttr {}
-   | |______________________________^
-   |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: diagnostic slug must be the first argument
   --> $DIR/diagnostic-derive.rs:76:16
    |
 LL | #[diag(nonsense("foo"), code = "E0123", slug = "foo")]
    |                ^
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:76:1
    |
 LL | / #[diag(nonsense("foo"), code = "E0123", slug = "foo")]
@@ -63,7 +53,7 @@ LL | |
 LL | | struct InvalidNestedStructAttr1 {}
    | |__________________________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: unknown argument
   --> $DIR/diagnostic-derive.rs:82:8
@@ -73,7 +63,7 @@ LL | #[diag(nonsense = "...", code = "E0123", slug = "foo")]
    |
    = note: only the `code` parameter is valid after the slug
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:82:1
    |
 LL | / #[diag(nonsense = "...", code = "E0123", slug = "foo")]
@@ -82,7 +72,7 @@ LL | |
 LL | | struct InvalidNestedStructAttr2 {}
    | |__________________________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: unknown argument
   --> $DIR/diagnostic-derive.rs:88:8
@@ -92,7 +82,7 @@ LL | #[diag(nonsense = 4, code = "E0123", slug = "foo")]
    |
    = note: only the `code` parameter is valid after the slug
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:88:1
    |
 LL | / #[diag(nonsense = 4, code = "E0123", slug = "foo")]
@@ -101,7 +91,7 @@ LL | |
 LL | | struct InvalidNestedStructAttr3 {}
    | |__________________________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: unknown argument
   --> $DIR/diagnostic-derive.rs:94:42
@@ -159,23 +149,23 @@ error: diagnostic slug must be the first argument
 LL | #[diag(no_crate_example, no_crate::example, code = "E0456")]
    |                                           ^
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:124:1
    |
 LL | struct KindNotProvided {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:127:1
    |
 LL | / #[diag(code = "E0456")]
 LL | |
 LL | | struct SlugNotProvided {}
    | |_________________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: the `#[primary_span]` attribute can only be applied to fields of type `Span` or `MultiSpan`
   --> $DIR/diagnostic-derive.rs:138:5
@@ -355,7 +345,7 @@ error: `#[error(...)]` is not a valid attribute
 LL | #[error(no_crate_example, code = "E0123")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:579:1
    |
 LL | / #[error(no_crate_example, code = "E0123")]
@@ -365,15 +355,15 @@ LL | |
 LL | | struct ErrorAttribute {}
    | |________________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: `#[warn_(...)]` is not a valid attribute
   --> $DIR/diagnostic-derive.rs:586:1
    |
 LL | #[warn_(no_crate_example, code = "E0123")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:586:1
    |
 LL | / #[warn_(no_crate_example, code = "E0123")]
@@ -383,15 +373,15 @@ LL | |
 LL | | struct WarnAttribute {}
    | |_______________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: `#[lint(...)]` is not a valid attribute
   --> $DIR/diagnostic-derive.rs:593:1
    |
 LL | #[lint(no_crate_example, code = "E0123")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: diagnostic slug not specified
+error: diagnostic slug or label is not specified
   --> $DIR/diagnostic-derive.rs:593:1
    |
 LL | / #[lint(no_crate_example, code = "E0123")]
@@ -401,7 +391,7 @@ LL | |
 LL | | struct LintAttributeOnSessionDiag {}
    | |____________________________________^
    |
-   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`
+   = help: specify the slug as the first argument to the `#[diag(...)]` attribute, such as `#[diag(hir_analysis_example_error)]`, or use format #[diag(label = "the message ..")]
 
 error: `#[lint(...)]` is not a valid attribute
   --> $DIR/diagnostic-derive.rs:600:1
@@ -658,7 +648,7 @@ note: required by a bound in `DiagnosticBuilder::<'a, G>::set_arg`
   --> $COMPILER_DIR/rustc_errors/src/diagnostic_builder.rs:LL:CC
    = note: this error originates in the macro `forward` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 84 previous errors
+error: aborting due to 83 previous errors
 
 Some errors have detailed explanations: E0277, E0425, E0433.
 For more information about an error, try `rustc --explain E0277`.

tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs

@@ -56,7 +56,7 @@ struct C {
 
 #[derive(Subdiagnostic)]
 #[label]
-//~^ ERROR diagnostic slug must be first argument
+//~^ ERROR diagnostic slug or raw_label must be first argument of
 struct D {
     #[primary_span]
     span: Span,
@@ -85,7 +85,7 @@ struct F {
 #[derive(Subdiagnostic)]
 #[label(bug = "...")]
 //~^ ERROR only `no_span` is a valid nested attribute
-//~| ERROR diagnostic slug must be first argument
+//~| ERROR diagnostic slug or raw_label must be first argument of
 struct G {
     #[primary_span]
     span: Span,
@@ -94,8 +94,6 @@ struct G {
 
 #[derive(Subdiagnostic)]
 #[label("...")]
-//~^ ERROR failed to resolve: maybe a missing crate `core`?
-//~| NOTE maybe a missing crate `core`?
 struct H {
     #[primary_span]
     span: Span,
@@ -105,7 +103,7 @@ struct H {
 #[derive(Subdiagnostic)]
 #[label(slug = 4)]
 //~^ ERROR only `no_span` is a valid nested attribute
-//~| ERROR diagnostic slug must be first argument
+//~| ERROR diagnostic slug or raw_label must be first argument of
 struct J {
     #[primary_span]
     span: Span,
@@ -115,7 +113,7 @@ struct J {
 #[derive(Subdiagnostic)]
 #[label(slug("..."))]
 //~^ ERROR only `no_span` is a valid nested attribute
-//~| ERROR diagnostic slug must be first argument
+//~| ERROR diagnostic slug or raw_label must be first argument of
 struct K {
     #[primary_span]
     span: Span,
@@ -134,7 +132,7 @@ struct L {
 
 #[derive(Subdiagnostic)]
 #[label()]
-//~^ ERROR diagnostic slug must be first argument of a `#[label(...)]` attribute
+//~^ ERROR diagnostic slug or raw_label must be first argument of a attribute
 struct M {
     #[primary_span]
     span: Span,
@@ -223,7 +221,7 @@ enum T {
 #[derive(Subdiagnostic)]
 enum U {
     #[label(code = "...")]
-    //~^ ERROR diagnostic slug must be first argument of a `#[label(...)]` attribute
+    //~^ ERROR diagnostic slug or raw_label must be first argument of a attribute
     //~| ERROR only `no_span` is a valid nested attribute
     A {
         #[primary_span]