Rollup merge of rust-lang#152121 - JonathanBrouwer:convert_builtin_macros, r=lqd

Convert to inline diagnostics in `rustc_builtin_macros`

For rust-lang#151366
r? @jdonszelmann

Author: JonathanBrouwer

Cargo.lock

@@ -3599,7 +3599,6 @@ dependencies = [
  "rustc_errors",
  "rustc_expand",
  "rustc_feature",
- "rustc_fluent_macro",
  "rustc_hir",
  "rustc_index",
  "rustc_lexer",
@@ -3773,7 +3772,6 @@ dependencies = [
  "rustc_ast",
  "rustc_ast_pretty",
  "rustc_borrowck",
- "rustc_builtin_macros",
  "rustc_codegen_ssa",
  "rustc_const_eval",
  "rustc_data_structures",

compiler/rustc_builtin_macros/Cargo.toml

@@ -15,7 +15,6 @@ rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_expand = { path = "../rustc_expand" }
 rustc_feature = { path = "../rustc_feature" }
-rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_index = { path = "../rustc_index" }
 rustc_lexer = { path = "../rustc_lexer" }

compiler/rustc_builtin_macros/messages.ftl

@@ -463,44 +463,44 @@ impl<'a, 'b> rustc_ast::visit::Visitor<'a> for AlwaysErrorOnGenericParam<'a, 'b>
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_coerce_pointee_requires_transparent, code = E0802)]
+#[diag("`CoercePointee` can only be derived on `struct`s with `#[repr(transparent)]`", code = E0802)]
 struct RequireTransparent {
     #[primary_span]
     span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_coerce_pointee_requires_one_field, code = E0802)]
+#[diag("`CoercePointee` can only be derived on `struct`s with at least one field", code = E0802)]
 struct RequireOneField {
     #[primary_span]
     span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_coerce_pointee_requires_one_generic, code = E0802)]
+#[diag("`CoercePointee` can only be derived on `struct`s that are generic over at least one type", code = E0802)]
 struct RequireOneGeneric {
     #[primary_span]
     span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_coerce_pointee_requires_one_pointee, code = E0802)]
+#[diag("exactly one generic type parameter must be marked as `#[pointee]` to derive `CoercePointee` traits", code = E0802)]
 struct RequireOnePointee {
     #[primary_span]
     span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_coerce_pointee_too_many_pointees, code = E0802)]
+#[diag("only one type parameter can be marked as `#[pointee]` when deriving `CoercePointee` traits", code = E0802)]
 struct TooManyPointees {
     #[primary_span]
     one: Span,
-    #[label]
+    #[label("here another type parameter is marked as `#[pointee]`")]
     another: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_coerce_pointee_requires_maybe_sized, code = E0802)]
+#[diag("`derive(CoercePointee)` requires `{$name}` to be marked `?Sized`", code = E0802)]
 struct RequiresMaybeSized {
     #[primary_span]
     span: Span,