Use diagnostic structs instead of manual emitted errors

Author: frank-king

compiler/rustc_ast_passes/messages.ftl

@@ -1,3 +1,7 @@
+ast_passes_anon_struct_or_union_not_allowed =
+    anonymous {$struct_or_union}s are not allowed outside of unnamed struct or union fields
+    .label = anonymous {$struct_or_union} declared here
+
 ast_passes_assoc_const_without_body =
     associated constant in `impl` without body
     .suggestion = provide a definition for the constant
@@ -162,6 +166,14 @@ ast_passes_inherent_cannot_be = inherent impls cannot be {$annotation}
 ast_passes_invalid_label =
     invalid label name `{$name}`
 
+ast_passes_invalid_unnamed_field =
+    unnamed fields are not allowed outside of structs or unions
+    .label = unnamed field declared here
+
+ast_passes_invalid_unnamed_field_ty =
+    unnamed fields can only have struct or union types
+    .label = not a struct or union
+
 ast_passes_item_underscore = `{$kind}` items in this context need a name
     .label = `_` is not a valid name for this `{$kind}` item
 

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -279,8 +279,6 @@ impl<'a> AstValidator<'a> {
         }
     }
 
-    #[allow(rustc::untranslatable_diagnostic)]
-    #[allow(rustc::diagnostic_outside_of_impl)]
     fn check_unnamed_field_ty(&self, ty: &Ty, span: Span) {
         if matches!(
             &ty.kind,
@@ -293,40 +291,27 @@ impl<'a> AstValidator<'a> {
         ) {
             return;
         }
-        let msg = "unnamed fields can only have struct or union types";
-        let label = "not a struct or union";
-        self.err_handler().struct_span_err(span, msg).span_label(ty.span, label).emit();
+        self.err_handler().emit_err(errors::InvalidUnnamedFieldTy { span, ty_span: ty.span });
     }
 
-    #[allow(rustc::untranslatable_diagnostic)]
-    #[allow(rustc::diagnostic_outside_of_impl)]
     fn deny_anon_struct_or_union(&self, ty: &Ty) {
         let struct_or_union = match &ty.kind {
             TyKind::AnonStruct(..) => "struct",
             TyKind::AnonUnion(..) => "union",
             _ => return,
         };
         self.err_handler()
-                    .struct_span_err(
-                        ty.span,
-                        format!("anonymous {struct_or_union}s are not allowed outside of unnamed struct or union fields"),
-                    )
-                    .span_label(ty.span, format!("anonymous {struct_or_union} declared here"))
-                    .emit();
+            .emit_err(errors::AnonStructOrUnionNotAllowed { struct_or_union, span: ty.span });
     }
 
-    #[allow(rustc::untranslatable_diagnostic)]
-    #[allow(rustc::diagnostic_outside_of_impl)]
     fn deny_unnamed_field(&self, field: &FieldDef) {
         if let Some(ident) = field.ident &&
             ident.name == kw::Underscore {
                 self.err_handler()
-                    .struct_span_err(
-                        field.span,
-                        "unnamed fields are not allowed outside of structs or unions",
-                    )
-                    .span_label(ident.span, "unnamed field declared here")
-                    .emit();
+                    .emit_err(errors::InvalidUnnamedField {
+                        span: field.span,
+                        ident_span: ident.span
+                    });
         }
     }
 

compiler/rustc_ast_passes/src/errors.rs

@@ -701,3 +701,30 @@ pub struct ConstraintOnNegativeBound {
     #[primary_span]
     pub span: Span,
 }
+
+#[derive(Diagnostic)]
+#[diag(ast_passes_invalid_unnamed_field_ty)]
+pub struct InvalidUnnamedFieldTy {
+    #[primary_span]
+    pub span: Span,
+    #[label]
+    pub ty_span: Span,
+}
+
+#[derive(Diagnostic)]
+#[diag(ast_passes_invalid_unnamed_field)]
+pub struct InvalidUnnamedField {
+    #[primary_span]
+    pub span: Span,
+    #[label]
+    pub ident_span: Span,
+}
+
+#[derive(Diagnostic)]
+#[diag(ast_passes_anon_struct_or_union_not_allowed)]
+pub struct AnonStructOrUnionNotAllowed {
+    #[primary_span]
+    #[label]
+    pub span: Span,
+    pub struct_or_union: &'static str,
+}