Rename (assoc/foreign)_type to (assoc/foreign)_ty

rust-lang · finalchild · Sep 9, 2022 · Sep 9, 2022 · Sep 9, 2022 · Sep 9, 2022
commit ae28c07ea7851d3cae5d45678e004cd0656b823a
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -1242,7 +1242,7 @@ 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_type_no_bounds(bounds, |span| ForeignTypeWithBound { 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);
             }
@@ -1535,12 +1535,12 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                     ..
                 }) => {
                     if ty.is_none() {
-                        self.session.emit_err(AssocTypeWithoutBody {
+                        self.session.emit_err(AssocTyWithoutBody {
                             span: item.span,
                             replace_span: self.ending_semi_or_hi(item.span),
                         });
                     }
-                    self.check_type_no_bounds(bounds, |span| ImplAssocTypeWithBound { span });
+                    self.check_type_no_bounds(bounds, |span| ImplAssocTyWithBound { span });
                     if ty.is_some() {
                         self.check_gat_where(
                             item.id,

diff --git a/compiler/rustc_ast_passes/src/errors.rs b/compiler/rustc_ast_passes/src/errors.rs
@@ -160,7 +160,7 @@ pub struct AssocFnWithoutBody {
 }
 
 #[derive(Diagnostic)]
-#[diag(ast_passes_assoc_type_without_body)]
+#[diag(ast_passes_assoc_ty_without_body)]
 pub struct AssocTypeWithoutBody {
     #[primary_span]
     pub span: Span,
@@ -225,23 +225,23 @@ pub enum ExternBlockSuggestion {
     },
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(ast_passes::ty_alias_with_bound)]
+#[derive(Diagnostic)]
+#[diag(ast_passes_ty_alias_with_bound)]
 pub struct TyAliasWithBound {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(ast_passes::foreign_type_with_bound)]
-pub struct ForeignTypeWithBound {
+#[derive(Diagnostic)]
+#[diag(ast_passes_foreign_ty_with_bound)]
+pub struct ForeignTyWithBound {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(ast_passes::impl_assoc_type_with_bound)]
-pub struct ImplAssocTypeWithBound {
+#[derive(Diagnostic)]
+#[diag(ast_passes_impl_assoc_ty_with_bound)]
+pub struct ImplAssocTyWithBound {
     #[primary_span]
     pub span: Span,
 }
diff --git a/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl b/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl
@@ -69,7 +69,7 @@ ast_passes_assoc_fn_without_body =
     associated function in `impl` without body
     .suggestion = provide a definition for the function
 
-ast_passes_assoc_type_without_body =
+ast_passes_assoc_ty_without_body =
     associated type in `impl` without body
     .suggestion = provide a definition for the type
 
@@ -94,8 +94,8 @@ ast_passes_extern_block_suggestion = if you meant to declare an externally defin
 ast_passes_ty_alias_with_bound =
     bounds on `type`s in this context have no effect
 
-ast_passes_foreign_type_with_bound =
+ast_passes_foreign_ty_with_bound =
     bounds on `type`s in `extern` blocks have no effect
 
-ast_passes_impl_assoc_type_with_bound =
+ast_passes_impl_assoc_ty_with_bound =
     bounds on `type`s in `impl`s have no effect