Migrate check_foreign_kind_bodyless and fix prev

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -432,24 +432,14 @@ impl<'a> AstValidator<'a> {
         }
     }
 
-    fn check_foreign_kind_bodyless(&self, ident: Ident, kind: &str, body: Option<Span>) {
+    fn check_foreign_kind_bodyless<D>(&self, ident: Ident, create_diag: impl FnOnce(Span, Span, Span) -> D, body: Option<Span>)
+    where
+        D: SessionDiagnostic<'a>,
+    {
         let Some(body) = body else {
             return;
         };
-        self.err_handler()
-            .struct_span_err(ident.span, &format!("incorrect `{}` inside `extern` block", kind))
-            .span_label(ident.span, "cannot have a body")
-            .span_label(body, "the invalid body")
-            .span_label(
-                self.current_extern_span(),
-                format!(
-                    "`extern` blocks define existing foreign {0}s and {0}s \
-                    inside of them cannot have a body",
-                    kind
-                ),
-            )
-            .note(MORE_EXTERN)
-            .emit();
+        self.session.emit_err(create_diag(ident.span, body, self.current_extern_span()));
     }
 
     /// An `fn` in `extern { ... }` cannot have a body `{ ... }`.
@@ -1230,13 +1220,13 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 ..
             }) => {
                 self.check_defaultness(fi.span, *defaultness);
-                self.check_foreign_kind_bodyless(fi.ident, "type", ty.as_ref().map(|b| b.span));
+                self.check_foreign_kind_bodyless(fi.ident, |span, body_span, extern_span| ForeignTyWithBody { span, body_span, extern_span }, ty.as_ref().map(|b| b.span));
                 self.check_type_no_bounds(bounds, |span| ForeignTyWithBound { span });
                 self.check_foreign_ty_genericless(generics, where_clauses.0.1);
                 self.check_foreign_item_ascii_only(fi.ident);
             }
             ForeignItemKind::Static(_, _, body) => {
-                self.check_foreign_kind_bodyless(fi.ident, "static", body.as_ref().map(|b| b.span));
+                self.check_foreign_kind_bodyless(fi.ident, |span, body_span, extern_span| ForeignStaticWithBody { span, body_span, extern_span }, body.as_ref().map(|b| b.span));
                 self.check_foreign_item_ascii_only(fi.ident);
             }
             ForeignItemKind::MacCall(..) => {}

compiler/rustc_ast_passes/src/errors.rs

@@ -253,7 +253,7 @@ pub struct ForeignTyWithGenericParam {
     #[primary_span]
     #[suggestion(code = "", applicability = "maybe-incorrect")]
     pub span: Span,
-    #[label]
+    #[label(ast_passes::extern_block_label)]
     pub extern_span: Span,
 }
 
@@ -264,6 +264,30 @@ pub struct ForeignTyWithWhereClause {
     #[primary_span]
     #[suggestion(code = "", applicability = "maybe-incorrect")]
     pub span: Span,
-    #[label]
+    #[label(ast_passes::extern_block_label)]
+    pub extern_span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::foreign_ty_with_body)]
+#[note(ast_passes::more_extern_note)]
+pub struct ForeignTyWithBody {
+    #[primary_span]
+    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_static_with_body)]
+#[note(ast_passes::more_extern_note)]
+pub struct ForeignStaticWithBody {
+    #[primary_span]
+    pub span: Span,
+    #[label(ast_passes::body_label)]
+    pub body_span: Span,
+    #[label(ast_passes::extern_block_label)]
     pub extern_span: Span,
 }

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

@@ -1,4 +1,4 @@
-ast_passes_more_extern_note =
+-ast_passes_more_extern =
     for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
 
 ast_passes_forbidden_let =
@@ -107,8 +107,24 @@ ast_passes_foreign_ty_with_generic_param =
     `type`s inside `extern` blocks cannot have generic parameters
     .suggestion = remove the generic parameters
     .extern_block_label = `extern` block begins here
+    .more_extern_note = { -ast_passes_more_extern }
 
 ast_passes_foreign_ty_with_where_clause =
     `type`s inside `extern` blocks cannot have `where` clauses
     .suggestion = remove the `where` clause
     .extern_block_label = `extern` block begins here
+    .more_extern_note = { -ast_passes_more_extern }
+
+ast_passes_foreign_ty_with_body =
+    incorrect `type` inside `extern` block
+    .label = cannot have a body
+    .body_label = the invalid body
+    .extern_block_label = `extern` blocks define existing foreign types and types inside of them cannot have a body
+    .more_extern_note = { -ast_passes_more_extern }
+
+ast_passes_foreign_static_with_body =
+    incorrect `static` inside `extern` block
+    .label = cannot have a 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 }