Migrate ForeignFnWith(Body/Qualifier) and fix prev

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -30,9 +30,6 @@ use std::ops::{Deref, DerefMut};
 
 use crate::errors::*;
 
-const MORE_EXTERN: &str =
-    "for more information, visit https://doc.rust-lang.org/std/keyword.extern.html";
-
 /// Is `self` allowed semantically as the first parameter in an `FnDecl`?
 enum SelfSemantic {
     Yes,
@@ -451,26 +448,11 @@ impl<'a> AstValidator<'a> {
         let Some(body) = body else {
             return;
         };
-        self.err_handler()
-            .struct_span_err(ident.span, "incorrect function inside `extern` block")
-            .span_label(ident.span, "cannot have a body")
-            .span_suggestion(
-                body.span,
-                "remove the invalid body",
-                ";",
-                Applicability::MaybeIncorrect,
-            )
-            .help(
-                "you might have meant to write a function accessible through FFI, \
-                which can be done by writing `extern fn` outside of the `extern` block",
-            )
-            .span_label(
-                self.current_extern_span(),
-                "`extern` blocks define existing foreign functions and functions \
-                inside of them cannot have a body",
-            )
-            .note(MORE_EXTERN)
-            .emit();
+        self.session.emit_err(ForeignFnWithBody {
+            span: ident.span,
+            body_span: body.span,
+            extern_span: self.current_extern_span(),
+        });
     }
 
     fn current_extern_span(&self) -> Span {
@@ -480,16 +462,11 @@ impl<'a> AstValidator<'a> {
     /// An `fn` in `extern { ... }` cannot have qualifiers, e.g. `async fn`.
     fn check_foreign_fn_headerless(&self, ident: Ident, span: Span, header: FnHeader) {
         if header.has_qualifiers() {
-            self.err_handler()
-                .struct_span_err(ident.span, "functions in `extern` blocks cannot have qualifiers")
-                .span_label(self.current_extern_span(), "in this `extern` block")
-                .span_suggestion_verbose(
-                    span.until(ident.span.shrink_to_lo()),
-                    "remove the qualifiers",
-                    "fn ",
-                    Applicability::MaybeIncorrect,
-                )
-                .emit();
+            self.session.emit_err(ForeignFnWithQualifier {
+                span: ident.span,
+                extern_span: self.current_extern_span(),
+                replace_span: span.until(ident.span.shrink_to_lo()),
+            });
         }
     }
 

compiler/rustc_ast_passes/src/errors.rs

@@ -273,6 +273,7 @@ pub struct ForeignTyWithWhereClause {
 #[note(ast_passes::more_extern_note)]
 pub struct ForeignTyWithBody {
     #[primary_span]
+    #[label]
     pub span: Span,
     #[label(ast_passes::body_label)]
     pub body_span: Span,
@@ -285,9 +286,35 @@ pub struct ForeignTyWithBody {
 #[note(ast_passes::more_extern_note)]
 pub struct ForeignStaticWithBody {
     #[primary_span]
+    #[label]
     pub span: Span,
     #[label(ast_passes::body_label)]
     pub body_span: Span,
     #[label(ast_passes::extern_block_label)]
     pub extern_span: Span,
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::foreign_fn_with_body)]
+#[help]
+#[note(ast_passes::more_extern_note)]
+pub struct ForeignFnWithBody {
+    #[primary_span]
+    #[label]
+    pub span: Span,
+    #[suggestion(code = ";", applicability = "maybe-incorrect")]
+    pub body_span: Span,
+    #[label(ast_passes::extern_block_label)]
+    pub extern_span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::foreign_fn_with_qualifier)]
+pub struct ForeignFnWithQualifier {
+    #[primary_span]
+    pub span: Span,
+    #[label(ast_passes::extern_block_label)]
+    pub extern_span: Span,
+    #[suggestion_verbose(code = "fn ", applicability = "maybe-incorrect")]
+    pub replace_span: Span,
+}

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

@@ -128,3 +128,16 @@ ast_passes_foreign_static_with_body =
     .body_label = the invalid body
     .extern_block_label = `extern` blocks define existing foreign statics and statics inside of them cannot have a body
     .more_extern_note = { -ast_passes_more_extern }
+
+ast_passes_foreign_fn_with_body =
+    incorrect function inside `extern` block
+    .label = cannot have a body
+    .suggestion = remove the invalid body
+    .help = you might have meant to write a function accessible through FFI, which can be done by writing `extern fn` outside of the `extern` block
+    .extern_block_label = `extern` blocks define existing foreign functions and functions inside of them cannot have a body
+    .more_extern_note = { -ast_passes_more_extern }
+
+ast_passes_foreign_fn_with_qualifier =
+    functions in `extern` blocks cannot have qualifiers
+    .extern_block_label = in this `extern` block
+    .suggestion = remove the qualifiers