Fix rebase

Co-authored-by: RanolP <public.ranolp@gmail.com>

Author: finalchild

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

@@ -219,11 +219,9 @@ ast_passes_deprecated_extern_missing_abi =
 ast_passes_generic_param_wrong_order =
     { $param_kind ->
         [lifetime] lifetime
-        [type] type
-       *[const] const
+       *[type_or_const] type and const
     } parameters must be declared prior to { $max_param_kind ->
         [lifetime] lifetime
-        [type] type
-       *[const] const
+       *[type_or_const] type and const
     } parameters
     .suggestion = reorder the parameters: lifetimes, then consts and types

compiler/rustc_errors/src/diagnostic_impls.rs

@@ -151,9 +151,7 @@ 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",
+            ast::ParamKindOrd::TypeOrConst => "type_or_const",
         }))
     }
 }