Migrate AutoTraitWith(GenericParam/SuperTraitOrWhereClause/AssocItem)

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -531,71 +531,35 @@ impl<'a> AstValidator<'a> {
 
     fn deny_generic_params(&self, generics: &Generics, ident_span: Span) {
         if !generics.params.is_empty() {
-            struct_span_err!(
-                self.session,
-                generics.span,
-                E0567,
-                "auto traits cannot have generic parameters"
-            )
-            .span_label(ident_span, "auto trait cannot have generic parameters")
-            .span_suggestion(
-                generics.span,
-                "remove the parameters",
-                "",
-                Applicability::MachineApplicable,
-            )
-            .emit();
+            self.session.emit_err(AutoTraitWithGenericParam { span: generics.span, ident_span });
         }
     }
 
-    fn emit_e0568(&self, span: Span, ident_span: Span) {
-        struct_span_err!(
-            self.session,
-            span,
-            E0568,
-            "auto traits cannot have super traits or lifetime bounds"
-        )
-        .span_label(ident_span, "auto trait cannot have super traits or lifetime bounds")
-        .span_suggestion(
-            span,
-            "remove the super traits or lifetime bounds",
-            "",
-            Applicability::MachineApplicable,
-        )
-        .emit();
-    }
-
     fn deny_super_traits(&self, bounds: &GenericBounds, ident_span: Span) {
         if let [.., last] = &bounds[..] {
             let span = ident_span.shrink_to_hi().to(last.span());
-            self.emit_e0568(span, ident_span);
+            self.session.emit_err(AutoTraitWithSuperTraitOrWhereClause { span, ident_span });
         }
     }
 
     fn deny_where_clause(&self, where_clause: &WhereClause, ident_span: Span) {
         if !where_clause.predicates.is_empty() {
-            self.emit_e0568(where_clause.span, ident_span);
+            self.session.emit_err(AutoTraitWithSuperTraitOrWhereClause {
+                span: where_clause.span,
+                ident_span,
+            });
         }
     }
 
     fn deny_items(&self, trait_items: &[P<AssocItem>], ident_span: Span) {
         if !trait_items.is_empty() {
             let spans: Vec<_> = trait_items.iter().map(|i| i.ident.span).collect();
             let total_span = trait_items.first().unwrap().span.to(trait_items.last().unwrap().span);
-            struct_span_err!(
-                self.session,
+            self.session.emit_err(AutoTraitWithAssocItem {
                 spans,
-                E0380,
-                "auto traits cannot have associated items"
-            )
-            .span_suggestion(
-                total_span,
-                "remove these associated items",
-                "",
-                Applicability::MachineApplicable,
-            )
-            .span_label(ident_span, "auto trait cannot have associated items")
-            .emit();
+                replace_span: total_span,
+                ident_span,
+            });
         }
     }
 

compiler/rustc_ast_passes/src/errors.rs

@@ -359,3 +359,33 @@ pub struct ModFileItemNonAscii {
     pub span: Span,
     pub name: Symbol,
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::auto_trait_with_generic_param, code = "E0567")]
+pub struct AutoTraitWithGenericParam {
+    #[primary_span]
+    #[suggestion(code = "", applicability = "machine-applicable")]
+    pub span: Span,
+    #[label(ast_passes::ident_label)]
+    pub ident_span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::auto_trait_with_super_trait_or_where_clause, code = "E0568")]
+pub struct AutoTraitWithSuperTraitOrWhereClause {
+    #[primary_span]
+    pub span: Span,
+    #[label(ast_passes::ident_label)]
+    pub ident_span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::auto_trait_with_assoc_item)]
+pub struct AutoTraitWithAssocItem {
+    #[primary_span]
+    pub spans: Vec<Span>,
+    #[suggestion(code = "", applicability = "machine-applicable")]
+    pub replace_span: Span,
+    #[label(ast_passes::ident_label)]
+    pub ident_span: Span,
+}

compiler/rustc_error_messages/locales/en-US/ast_passes.ftl

@@ -160,3 +160,18 @@ ast_passes_nomangle_item_non_ascii =
 ast_passes_mod_file_item_non_ascii =
     trying to load file for module `{$name}` with non-ascii identifier name
     .help = consider using `#[path]` attribute to specify filesystem path
+
+ast_passes_auto_trait_with_generic_param =
+    auto traits cannot have generic parameters
+    .ident_label = auto trait cannot have generic parameters
+    .suggestion = remove the parameters
+
+ast_passes_auto_trait_with_super_trait_or_where_clause =
+    auto traits cannot have super traits or lifetime bounds
+    .ident_label = auto trait cannot have super traits or lifetime bounds
+    .suggestion = remove the super traits or lifetime bounds
+
+ast_passes_auto_trait_with_assoc_item =
+    auto traits cannot have associated items
+    .suggestion = remove these associated items
+    .ident_label = auto trait cannot have associated items