Migrate GenericArgAfterConstraint and fix prev

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -13,7 +13,7 @@ use rustc_ast::walk_list;
 use rustc_ast::*;
 use rustc_ast_pretty::pprust::{self, State};
 use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::{error_code, fluent, pluralize, struct_span_err, Applicability};
+use rustc_errors::{error_code, fluent, struct_span_err, Applicability};
 use rustc_macros::Subdiagnostic;
 use rustc_parse::validate_attr;
 use rustc_session::lint::builtin::{
@@ -602,32 +602,21 @@ impl<'a> AstValidator<'a> {
                 AngleBracketedArg::Constraint(c) => Either::Left(c.span),
                 AngleBracketedArg::Arg(a) => Either::Right(a.span()),
             });
+        let last_arg_span = *arg_spans.last().unwrap();
+        let first_constraint_span = constraint_spans[0];
         let args_len = arg_spans.len();
-        let constraint_len = constraint_spans.len();
+        let constraints_len = constraint_spans.len();
         // ...and then error:
-        self.err_handler()
-            .struct_span_err(
-                arg_spans.clone(),
-                "generic arguments must come before the first constraint",
-            )
-            .span_label(constraint_spans[0], &format!("constraint{}", pluralize!(constraint_len)))
-            .span_label(
-                *arg_spans.iter().last().unwrap(),
-                &format!("generic argument{}", pluralize!(args_len)),
-            )
-            .span_labels(constraint_spans, "")
-            .span_labels(arg_spans, "")
-            .span_suggestion_verbose(
-                data.span,
-                &format!(
-                    "move the constraint{} after the generic argument{}",
-                    pluralize!(constraint_len),
-                    pluralize!(args_len)
-                ),
-                self.correct_generic_order_suggestion(&data),
-                Applicability::MachineApplicable,
-            )
-            .emit();
+        self.session.emit_err(GenericArgAfterConstraint {
+            arg_spans: arg_spans.clone(),
+            constraint_spans,
+            last_arg_span,
+            first_constraint_span,
+            replace_span: data.span,
+            args_len,
+            constraints_len,
+            correct_order: self.correct_generic_order_suggestion(&data),
+        });
     }
 
     fn visit_ty_common(&mut self, ty: &'a Ty) {

compiler/rustc_ast_passes/src/errors.rs

@@ -374,13 +374,14 @@ pub struct AutoTraitWithGenericParam {
 #[diag(ast_passes::auto_trait_with_super_trait_or_where_clause, code = "E0568")]
 pub struct AutoTraitWithSuperTraitOrWhereClause {
     #[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_assoc_item)]
+#[diag(ast_passes::auto_trait_with_assoc_item, code = "E0380")]
 pub struct AutoTraitWithAssocItem {
     #[primary_span]
     pub spans: Vec<Span>,
@@ -389,3 +390,21 @@ pub struct AutoTraitWithAssocItem {
     #[label(ast_passes::ident_label)]
     pub ident_span: Span,
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::generic_arg_after_constraint)]
+pub struct GenericArgAfterConstraint {
+    #[primary_span]
+    pub arg_spans: Vec<Span>,
+    #[label(ast_passes::constraints_label)]
+    pub constraint_spans: Vec<Span>,
+    #[label(ast_passes::last_arg_label)]
+    pub last_arg_span: Span,
+    #[label(ast_passes::first_constraint_label)]
+    pub first_constraint_span: Span,
+    #[suggestion_verbose(code = "{correct_order}", applicability = "machine-applicable")]
+    pub replace_span: Span,
+    pub args_len: usize,
+    pub constraints_len: usize,
+    pub correct_order: String,
+}

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

@@ -175,3 +175,23 @@ 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
+
+ast_passes_generic_arg_after_constraint =
+    generic arguments must come before the first constraint
+    .first_constraint_label = { $constraints_len ->
+        [one] constraint
+       *[other] constraints
+    }
+    .last_arg_label = { $args_len ->
+        [one] generic argument
+       *[other] generic arguments
+    }
+    .constraints_label = {""}
+    .args_label = {""}
+    .suggestion = move the { $constraints_len ->
+        [one] constraint
+       *[other] constraints
+    } after the { $args_len ->
+        [one] generic argument
+       *[other] generic arguments
+    }