Migrate GenericParamWrongOrder

rust-lang · finalchild · Sep 9, 2022 · Sep 9, 2022 · Sep 9, 2022 · Sep 9, 2022
commit baab6c175cf5cee2f0e16d6450f6f5b3acdd561c
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -686,11 +686,7 @@ impl<'a> AstValidator<'a> {
 
 /// Checks that generic parameters are in the correct order,
 /// which is lifetimes, then types and then consts. (`<'a, T, const N: usize>`)
-fn validate_generic_param_order(
-    handler: &rustc_errors::Handler,
-    generics: &[GenericParam],
-    span: Span,
-) {
+fn validate_generic_param_order(session: &Session, generics: &[GenericParam], span: Span) {
     let mut max_param: Option<ParamKindOrd> = None;
     let mut out_of_order = FxHashMap::default();
     let mut param_idents = Vec::with_capacity(generics.len());
@@ -749,21 +745,14 @@ fn validate_generic_param_order(
 
         ordered_params += ">";
 
-        for (param_ord, (max_param, spans)) in &out_of_order {
-            let mut err = handler.struct_span_err(
-                spans.clone(),
-                &format!(
-                    "{} parameters must be declared prior to {} parameters",
-                    param_ord, max_param,
-                ),
-            );
-            err.span_suggestion(
-                span,
-                "reorder the parameters: lifetimes, then consts and types",
-                &ordered_params,
-                Applicability::MachineApplicable,
-            );
-            err.emit();
+        for (param_ord, (max_param, spans)) in out_of_order {
+            session.emit_err(GenericParamWrongOrder {
+                spans,
+                param_kind: param_ord,
+                max_param_kind: max_param,
+                replace_span: span,
+                correct_order: ordered_params.clone(),
+            });
         }
     }
 }
@@ -1186,7 +1175,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
             }
         }
 
-        validate_generic_param_order(self.err_handler(), &generics.params, generics.span);
+        validate_generic_param_order(self.session, &generics.params, generics.span);
 
         for predicate in &generics.where_clause.predicates {
             if let WherePredicate::EqPredicate(predicate) = predicate {

diff --git a/compiler/rustc_ast_passes/src/errors.rs b/compiler/rustc_ast_passes/src/errors.rs
@@ -1,5 +1,7 @@
 //! Errors emitted by ast_passes.
 
+use rustc_ast::ParamKindOrd;
+use rustc_errors::{fluent, AddToDiagnostic, Applicability, Diagnostic, SubdiagnosticMessage};
 use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_span::{Span, Symbol};
 
@@ -246,7 +248,7 @@ pub struct ImplAssocTyWithBound {
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::foreign_ty_with_generic_param)]
 #[note(ast_passes::more_extern_note)]
 pub struct ForeignTyWithGenericParam {
@@ -257,7 +259,7 @@ pub struct ForeignTyWithGenericParam {
     pub extern_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::foreign_ty_with_where_clause)]
 #[note(ast_passes::more_extern_note)]
 pub struct ForeignTyWithWhereClause {
@@ -268,7 +270,7 @@ pub struct ForeignTyWithWhereClause {
     pub extern_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::foreign_ty_with_body)]
 #[note(ast_passes::more_extern_note)]
 pub struct ForeignTyWithBody {
@@ -281,7 +283,7 @@ pub struct ForeignTyWithBody {
     pub extern_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::foreign_static_with_body)]
 #[note(ast_passes::more_extern_note)]
 pub struct ForeignStaticWithBody {
@@ -294,7 +296,7 @@ pub struct ForeignStaticWithBody {
     pub extern_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::foreign_fn_with_body)]
 #[help]
 #[note(ast_passes::more_extern_note)]
@@ -308,7 +310,7 @@ pub struct ForeignFnWithBody {
     pub extern_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::foreign_fn_with_qualifier)]
 pub struct ForeignFnWithQualifier {
     #[primary_span]
@@ -319,7 +321,7 @@ pub struct ForeignFnWithQualifier {
     pub replace_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::foreign_item_non_ascii)]
 #[note]
 pub struct ForeignItemNonAscii {
@@ -329,29 +331,29 @@ pub struct ForeignItemNonAscii {
     pub extern_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::forbidden_c_var_args)]
 pub struct ForbiddenCVarArgs {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::unnamed_assoc_const)]
 pub struct UnnamedAssocConst {
     #[primary_span]
     #[label]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::nomangle_item_non_ascii, code = "E0754")]
 pub struct NomangleItemNonAscii {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::mod_file_item_non_ascii, code = "E0754")]
 #[help]
 pub struct ModFileItemNonAscii {
@@ -360,7 +362,7 @@ pub struct ModFileItemNonAscii {
     pub name: Symbol,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::auto_trait_with_generic_param, code = "E0567")]
 pub struct AutoTraitWithGenericParam {
     #[primary_span]
@@ -370,7 +372,7 @@ pub struct AutoTraitWithGenericParam {
     pub ident_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::auto_trait_with_super_trait_or_where_clause, code = "E0568")]
 pub struct AutoTraitWithSuperTraitOrWhereClause {
     #[primary_span]
@@ -380,7 +382,7 @@ pub struct AutoTraitWithSuperTraitOrWhereClause {
     pub ident_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::auto_trait_with_assoc_item, code = "E0380")]
 pub struct AutoTraitWithAssocItem {
     #[primary_span]
@@ -391,7 +393,7 @@ pub struct AutoTraitWithAssocItem {
     pub ident_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::generic_arg_after_constraint)]
 pub struct GenericArgAfterConstraint {
     #[primary_span]
@@ -409,28 +411,28 @@ pub struct GenericArgAfterConstraint {
     pub correct_order: String,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::fn_ptr_ty_with_pat, code = "E0561")]
 pub struct FnPtrTyWithPat {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::multiple_explicit_lifetime_bound, code = "E0226")]
 pub struct MultipleExplicitLifetimeBound {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::impl_trait_ty_in_path_param, code = "E0667")]
 pub struct ImplTraitTyInPathParam {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::impl_trait_ty_nested, code = "E0666")]
 pub struct ImplTraitTyNested {
     #[primary_span]
@@ -440,9 +442,21 @@ pub struct ImplTraitTyNested {
     pub outer_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(ast_passes::impl_trait_ty_without_trait_bound)]
 pub struct ImplTraitTyWithoutTraitBound {
     #[primary_span]
     pub span: Span,
 }
+
+#[derive(Diagnostic)]
+#[diag(ast_passes::generic_param_wrong_order)]
+pub struct GenericParamWrongOrder {
+    #[primary_span]
+    pub spans: Vec<Span>,
+    pub param_kind: ParamKindOrd,
+    pub max_param_kind: ParamKindOrd,
+    #[suggestion(code = "{correct_order}", applicability = "machine-applicable")]
+    pub replace_span: Span,
+    pub correct_order: String,
+}
diff --git a/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl b/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl
@@ -215,3 +215,15 @@ ast_passes_impl_trait_ty_without_trait_bound =
 
 ast_passes_deprecated_extern_missing_abi =
     extern declarations without an explicit ABI are deprecated
+
+ast_passes_generic_param_wrong_order =
+    { $param_kind ->
+        [lifetime] lifetime
+        [type] type
+       *[const] const
+    } parameters must be declared prior to { $max_param_kind ->
+        [lifetime] lifetime
+        [type] type
+       *[const] const
+    } parameters
+    .suggestion = reorder the parameters: lifetimes, then consts and types
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs
@@ -3,6 +3,7 @@ use crate::{
     CodeSuggestion, DiagnosticBuilder, DiagnosticMessage, EmissionGuarantee, Level, MultiSpan,
     SubdiagnosticMessage, Substitution, SubstitutionPart, SuggestionStyle,
 };
+
 use rustc_data_structures::fx::FxHashMap;
 use rustc_error_messages::fluent_value_from_str_list_sep_by_and;
 use rustc_error_messages::FluentValue;

diff --git a/compiler/rustc_errors/src/diagnostic_impls.rs b/compiler/rustc_errors/src/diagnostic_impls.rs
@@ -147,6 +147,17 @@ impl IntoDiagnosticArg for hir::ConstContext {
     }
 }
 
+impl IntoDiagnosticArg for ast::ParamKindOrd {
+    fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> {
+        DiagnosticArgValue::Str(Cow::Borrowed(match self {
+            ast::ParamKindOrd::Lifetime => "lifetime",
+            ast::ParamKindOrd::Type => "type",
+            ast::ParamKindOrd::Const => "const",
+            ast::ParamKindOrd::Infer => "infer",
+        }))
+    }
+}
+
 impl IntoDiagnosticArg for ast::Path {
     fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> {
         DiagnosticArgValue::Str(Cow::Owned(pprust::path_to_string(&self)))