Rollup merge of #152045 - JonathanBrouwer:rustc_infer_convert, r=lqd

Convert to inline diagnostics in `rustc_infer`

For https://github.com/rust-lang/rust/issues/151366

Cargo.lock

@@ -3794,7 +3794,6 @@ dependencies = [
  "rustc_hir_typeck",
  "rustc_incremental",
  "rustc_index",
- "rustc_infer",
  "rustc_interface",
  "rustc_lexer",
  "rustc_lint",
@@ -4092,7 +4091,6 @@ version = "0.0.0"
 dependencies = [
  "rustc_data_structures",
  "rustc_errors",
- "rustc_fluent_macro",
  "rustc_hir",
  "rustc_index",
  "rustc_macros",

compiler/rustc_driver_impl/Cargo.toml

@@ -26,7 +26,6 @@ rustc_hir_pretty = { path = "../rustc_hir_pretty" }
 rustc_hir_typeck = { path = "../rustc_hir_typeck" }
 rustc_incremental = { path = "../rustc_incremental" }
 rustc_index = { path = "../rustc_index" }
-rustc_infer = { path = "../rustc_infer" }
 rustc_interface = { path = "../rustc_interface" }
 rustc_lexer = { path = "../rustc_lexer" }
 rustc_lint = { path = "../rustc_lint" }

compiler/rustc_driver_impl/src/lib.rs

@@ -126,7 +126,6 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
     rustc_hir_analysis::DEFAULT_LOCALE_RESOURCE,
     rustc_hir_typeck::DEFAULT_LOCALE_RESOURCE,
     rustc_incremental::DEFAULT_LOCALE_RESOURCE,
-    rustc_infer::DEFAULT_LOCALE_RESOURCE,
     rustc_interface::DEFAULT_LOCALE_RESOURCE,
     rustc_lint::DEFAULT_LOCALE_RESOURCE,
     rustc_metadata::DEFAULT_LOCALE_RESOURCE,

compiler/rustc_infer/Cargo.toml

@@ -10,7 +10,6 @@ doctest = false
 # tidy-alphabetical-start
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
-rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_index = { path = "../rustc_index" }
 rustc_macros = { path = "../rustc_macros" }

compiler/rustc_infer/messages.ftl

@@ -1,5 +0,0 @@
-infer_opaque_hidden_type =
-    opaque type's hidden type cannot be another opaque type from the same scope
-    .label = one of the two opaque types used here has to be outside its defining scope
-    .opaque_type = opaque type whose hidden type is being assigned
-    .hidden_type = opaque type being used as hidden type

compiler/rustc_infer/src/errors.rs

@@ -2,13 +2,13 @@ use rustc_macros::Diagnostic;
 use rustc_span::Span;
 
 #[derive(Diagnostic)]
-#[diag(infer_opaque_hidden_type)]
+#[diag("opaque type's hidden type cannot be another opaque type from the same scope")]
 pub(crate) struct OpaqueHiddenTypeDiag {
     #[primary_span]
-    #[label]
+    #[label("one of the two opaque types used here has to be outside its defining scope")]
     pub span: Span,
-    #[note(infer_opaque_type)]
+    #[note("opaque type whose hidden type is being assigned")]
     pub opaque_type: Span,
-    #[note(infer_hidden_type)]
+    #[note("opaque type being used as hidden type")]
     pub hidden_type: Span,
 }

compiler/rustc_infer/src/lib.rs

@@ -22,5 +22,3 @@
 mod errors;
 pub mod infer;
 pub mod traits;
-
-rustc_fluent_macro::fluent_messages! { "../messages.ftl" }