Migrate FnPtrTyWithPat, MultipleExplicitLifetimeBound, ImplTraitTyInPathParam, ImplTraitTyNested, ImplTraitTyWithoutTraitBound, deprecated_extern_missing_abi

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -624,13 +624,7 @@ impl<'a> AstValidator<'a> {
             TyKind::BareFn(bfty) => {
                 self.check_fn_decl(&bfty.decl, SelfSemantic::No);
                 Self::check_decl_no_pat(&bfty.decl, |span, _, _| {
-                    struct_span_err!(
-                        self.session,
-                        span,
-                        E0561,
-                        "patterns aren't allowed in function pointer types"
-                    )
-                    .emit();
+                    self.session.emit_err(FnPtrTyWithPat { span });
                 });
                 self.check_late_bound_lifetime_defs(&bfty.generic_params);
                 if let Extern::Implicit(_) = bfty.ext {
@@ -643,13 +637,9 @@ impl<'a> AstValidator<'a> {
                 for bound in bounds {
                     if let GenericBound::Outlives(lifetime) = bound {
                         if any_lifetime_bounds {
-                            struct_span_err!(
-                                self.session,
-                                lifetime.ident.span,
-                                E0226,
-                                "only a single explicit lifetime bound is permitted"
-                            )
-                            .emit();
+                            self.session.emit_err(MultipleExplicitLifetimeBound {
+                                span: lifetime.ident.span,
+                            });
                             break;
                         }
                         any_lifetime_bounds = true;
@@ -658,29 +648,15 @@ impl<'a> AstValidator<'a> {
             }
             TyKind::ImplTrait(_, bounds) => {
                 if self.is_impl_trait_banned {
-                    struct_span_err!(
-                        self.session,
-                        ty.span,
-                        E0667,
-                        "`impl Trait` is not allowed in path parameters"
-                    )
-                    .emit();
+                    self.session.emit_err(ImplTraitTyInPathParam { span: ty.span });
                 }
 
-                if let Some(outer_impl_trait_sp) = self.outer_impl_trait {
-                    struct_span_err!(
-                        self.session,
-                        ty.span,
-                        E0666,
-                        "nested `impl Trait` is not allowed"
-                    )
-                    .span_label(outer_impl_trait_sp, "outer `impl Trait`")
-                    .span_label(ty.span, "nested `impl Trait` here")
-                    .emit();
+                if let Some(outer_span) = self.outer_impl_trait {
+                    self.session.emit_err(ImplTraitTyNested { nested_span: ty.span, outer_span });
                 }
 
                 if !bounds.iter().any(|b| matches!(b, GenericBound::Trait(..))) {
-                    self.err_handler().span_err(ty.span, "at least one trait must be specified");
+                    self.session.emit_err(ImplTraitTyWithoutTraitBound { span: ty.span });
                 }
             }
             _ => {}
@@ -701,7 +677,7 @@ impl<'a> AstValidator<'a> {
                 MISSING_ABI,
                 id,
                 span,
-                "extern declarations without an explicit ABI are deprecated",
+                fluent::ast_passes::deprecated_extern_missing_abi,
                 BuiltinLintDiagnostics::MissingAbi(span, abi::Abi::FALLBACK),
             )
         }

compiler/rustc_ast_passes/src/errors.rs

@@ -408,3 +408,41 @@ pub struct GenericArgAfterConstraint {
     pub constraints_len: usize,
     pub correct_order: String,
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::fn_ptr_ty_with_pat, code = "E0561")]
+pub struct FnPtrTyWithPat {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::multiple_explicit_lifetime_bound, code = "E0226")]
+pub struct MultipleExplicitLifetimeBound {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::impl_trait_ty_in_path_param, code = "E0667")]
+pub struct ImplTraitTyInPathParam {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::impl_trait_ty_nested, code = "E0666")]
+pub struct ImplTraitTyNested {
+    #[primary_span]
+    #[label(ast_passes::nested_label)]
+    pub nested_span: Span,
+    #[label(ast_passes::outer_label)]
+    pub outer_span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::impl_trait_ty_without_trait_bound)]
+pub struct ImplTraitTyWithoutTraitBound {
+    #[primary_span]
+    pub span: Span,
+}

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

@@ -195,3 +195,23 @@ ast_passes_generic_arg_after_constraint =
         [one] generic argument
        *[other] generic arguments
     }
+
+ast_passes_fn_ptr_ty_with_pat =
+    patterns aren't allowed in function pointer types
+
+ast_passes_multiple_explicit_lifetime_bound =
+    only a single explicit lifetime bound is permitted
+
+ast_passes_impl_trait_ty_in_path_param =
+    `impl Trait` is not allowed in path parameters
+
+ast_passes_impl_trait_ty_nested =
+    nested `impl Trait` is not allowed
+    .outer_label = outer `impl Trait`
+    .nested_label = nested `impl Trait` here
+
+ast_passes_impl_trait_ty_without_trait_bound =
+    at least one trait must be specified
+
+ast_passes_deprecated_extern_missing_abi =
+    extern declarations without an explicit ABI are deprecated