Migrate ForeignItemNonAscii, ForbiddenCVarArgs, UnnamedAssocConst, NomangleItemNonAscii

Author: finalchild

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -473,18 +473,10 @@ impl<'a> AstValidator<'a> {
     /// An item in `extern { ... }` cannot use non-ascii identifier.
     fn check_foreign_item_ascii_only(&self, ident: Ident) {
         if !ident.as_str().is_ascii() {
-            let n = 83942;
-            self.err_handler()
-                .struct_span_err(
-                    ident.span,
-                    "items in `extern` blocks cannot use non-ascii identifiers",
-                )
-                .span_label(self.current_extern_span(), "in this `extern` block")
-                .note(&format!(
-                    "this limitation may be lifted in the future; see issue #{} <https://github.com/rust-lang/rust/issues/{}> for more information",
-                    n, n,
-                ))
-                .emit();
+            self.session.emit_err(ForeignItemNonAscii {
+                span: ident.span,
+                extern_span: self.current_extern_span(),
+            });
         }
     }
 
@@ -507,53 +499,34 @@ impl<'a> AstValidator<'a> {
 
         for Param { ty, span, .. } in &fk.decl().inputs {
             if let TyKind::CVarArgs = ty.kind {
-                self.err_handler()
-                    .struct_span_err(
-                        *span,
-                        "only foreign or `unsafe extern \"C\"` functions may be C-variadic",
-                    )
-                    .emit();
+                self.session.emit_err(ForbiddenCVarArgs { span: *span });
             }
         }
     }
 
-    fn check_item_named(&self, ident: Ident, kind: &str) {
+    fn check_item_named<D>(&self, ident: Ident, create_diag: impl FnOnce(Span) -> D)
+    where
+        D: SessionDiagnostic<'a>,
+    {
         if ident.name != kw::Underscore {
             return;
         }
-        self.err_handler()
-            .struct_span_err(ident.span, &format!("`{}` items in this context need a name", kind))
-            .span_label(ident.span, format!("`_` is not a valid name for this `{}` item", kind))
-            .emit();
+        self.session.emit_err(create_diag(ident.span));
     }
 
     fn check_nomangle_item_asciionly(&self, ident: Ident, item_span: Span) {
         if ident.name.as_str().is_ascii() {
             return;
         }
         let head_span = self.session.source_map().guess_head_span(item_span);
-        struct_span_err!(
-            self.session,
-            head_span,
-            E0754,
-            "`#[no_mangle]` requires ASCII identifier"
-        )
-        .emit();
+        self.session.emit_err(NomangleItemNonAscii { span: head_span });
     }
 
     fn check_mod_file_item_asciionly(&self, ident: Ident) {
         if ident.name.as_str().is_ascii() {
             return;
         }
-        struct_span_err!(
-            self.session,
-            ident.span,
-            E0754,
-            "trying to load file for module `{}` with non-ascii identifier name",
-            ident.name
-        )
-        .help("consider using `#[path]` attribute to specify filesystem path")
-        .emit();
+        self.session.emit_err(ModFileItemNonAscii { span: ident.span, name: ident.name });
     }
 
     fn deny_generic_params(&self, generics: &Generics, ident_span: Span) {
@@ -1537,7 +1510,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
         }
 
         if let AssocItemKind::Const(..) = item.kind {
-            self.check_item_named(item.ident, "const");
+            self.check_item_named(item.ident, |span| UnnamedAssocConst { span });
         }
 
         match &item.kind {

compiler/rustc_ast_passes/src/errors.rs

@@ -318,3 +318,44 @@ pub struct ForeignFnWithQualifier {
     #[suggestion_verbose(code = "fn ", applicability = "maybe-incorrect")]
     pub replace_span: Span,
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::foreign_item_non_ascii)]
+#[note]
+pub struct ForeignItemNonAscii {
+    #[primary_span]
+    pub span: Span,
+    #[label(ast_passes::extern_block_label)]
+    pub extern_span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::forbidden_c_var_args)]
+pub struct ForbiddenCVarArgs {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::unnamed_assoc_const)]
+pub struct UnnamedAssocConst {
+    #[primary_span]
+    #[label]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::nomangle_item_non_ascii, code = "E0754")]
+pub struct NomangleItemNonAscii {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(ast_passes::mod_file_item_non_ascii, code = "E0754")]
+#[help]
+pub struct ModFileItemNonAscii {
+    #[primary_span]
+    pub span: Span,
+    pub name: Symbol,
+}

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

@@ -107,37 +107,56 @@ 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 }
+    .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 }
+    .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 }
+    .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 }
+    .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 }
+    .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
+
+ast_passes_foreign_item_non_ascii =
+    items in `extern` blocks cannot use non-ascii identifiers
+    .extern_block_label = in this `extern` block
+    .note = this limitation may be lifted in the future; see issue #83942 <https://github.com/rust-lang/rust/issues/83942> for more information
+
+ast_passes_forbidden_c_var_args =
+    only foreign or `unsafe extern "C"` functions may be C-variadic
+
+ast_passes_unnamed_assoc_const =
+    `const` items in this context need a name
+    .label = `_` is not a valid name for this `const` item
+
+ast_passes_nomangle_item_non_ascii =
+    `#[no_mangle]` requires ASCII identifier
+
+ast_passes_mod_file_item_non_ascii =
+    trying to load file for module `{$name}` with non-ascii identifier name
+    .help = consider using `#[path]` attribute to specify filesystem path