Migrate check_foreign_ty_genericless

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -417,29 +417,18 @@ impl<'a> AstValidator<'a> {
     }
 
     fn check_foreign_ty_genericless(&self, generics: &Generics, where_span: Span) {
-        let cannot_have = |span, descr, remove_descr| {
-            self.err_handler()
-                .struct_span_err(
-                    span,
-                    &format!("`type`s inside `extern` blocks cannot have {}", descr),
-                )
-                .span_suggestion(
-                    span,
-                    &format!("remove the {}", remove_descr),
-                    "",
-                    Applicability::MaybeIncorrect,
-                )
-                .span_label(self.current_extern_span(), "`extern` block begins here")
-                .note(MORE_EXTERN)
-                .emit();
-        };
-
         if !generics.params.is_empty() {
-            cannot_have(generics.span, "generic parameters", "generic parameters");
+            self.session.emit_err(ForeignTyWithGenericParam {
+                span: generics.span,
+                extern_span: self.current_extern_span(),
+            });
         }
 
         if !generics.where_clause.predicates.is_empty() {
-            cannot_have(where_span, "`where` clauses", "`where` clause");
+            self.session.emit_err(ForeignTyWithWhereClause {
+                span: where_span,
+                extern_span: self.current_extern_span(),
+            });
         }
     }
 

compiler/rustc_ast_passes/src/errors.rs

@@ -245,3 +245,25 @@ pub struct ImplAssocTyWithBound {
     #[primary_span]
     pub span: Span,
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::foreign_ty_with_generic_param)]
+#[note(ast_passes::more_extern_note)]
+pub struct ForeignTyWithGenericParam {
+    #[primary_span]
+    #[suggestion(code = "", applicability = "maybe-incorrect")]
+    pub span: Span,
+    #[label]
+    pub extern_span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::foreign_ty_with_where_clause)]
+#[note(ast_passes::more_extern_note)]
+pub struct ForeignTyWithWhereClause {
+    #[primary_span]
+    #[suggestion(code = "", applicability = "maybe-incorrect")]
+    pub span: Span,
+    #[label]
+    pub extern_span: Span,
+}

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

@@ -1,3 +1,6 @@
+ast_passes_more_extern_note =
+    for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
 ast_passes_forbidden_let =
     `let` expressions are not supported here
     .note = only supported directly in conditions of `if` and `while` expressions
@@ -99,3 +102,13 @@ ast_passes_foreign_ty_with_bound =
 
 ast_passes_impl_assoc_ty_with_bound =
     bounds on `type`s in `impl`s have no effect
+
+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
+
+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