Convert to inline diagnostics in rustc_codegen_ssa

Cargo.lock

@@ -3673,7 +3673,6 @@ dependencies = [
  "rustc_attr_parsing",
  "rustc_data_structures",
  "rustc_errors",
- "rustc_fluent_macro",
  "rustc_fs_util",
  "rustc_hashes",
  "rustc_hir",

compiler/rustc_codegen_ssa/Cargo.toml

@@ -18,7 +18,6 @@ rustc_ast = { path = "../rustc_ast" }
 rustc_attr_parsing = { path = "../rustc_attr_parsing" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
-rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 rustc_fs_util = { path = "../rustc_fs_util" }
 rustc_hashes = { path = "../rustc_hashes" }
 rustc_hir = { path = "../rustc_hir" }

compiler/rustc_codegen_ssa/src/back/apple.rs

@@ -3,14 +3,14 @@ use std::path::PathBuf;
 use std::process::Command;
 
 use itertools::Itertools;
+use rustc_errors::inline_fluent;
 use rustc_middle::middle::exported_symbols::SymbolExportKind;
 use rustc_session::Session;
 pub(super) use rustc_target::spec::apple::OSVersion;
 use rustc_target::spec::{Arch, Env, Os, Target};
 use tracing::debug;
 
 use crate::errors::{XcrunError, XcrunSdkPathWarning};
-use crate::fluent_generated as fluent;
 
 #[cfg(test)]
 mod tests;
@@ -185,19 +185,21 @@ pub(super) fn get_sdk_root(sess: &Session) -> Option<PathBuf> {
             // FIXME(madsmtm): Make this a lint, to allow deny warnings to work.
             // (Or fix <https://github.com/rust-lang/rust/issues/21204>).
             let mut diag = sess.dcx().create_warn(err);
-            diag.note(fluent::codegen_ssa_xcrun_about);
+            diag.note(inline_fluent!("the SDK is needed by the linker to know where to find symbols in system libraries and for embedding the SDK version in the final object file"));
 
             // Recognize common error cases, and give more Rust-specific error messages for those.
             if let Some(developer_dir) = xcode_select_developer_dir() {
                 diag.arg("developer_dir", &developer_dir);
-                diag.note(fluent::codegen_ssa_xcrun_found_developer_dir);
+                diag.note(inline_fluent!(
+                    "found active developer directory at \"{$developer_dir}\""
+                ));
                 if developer_dir.as_os_str().to_string_lossy().contains("CommandLineTools") {
                     if sdk_name != "MacOSX" {
-                        diag.help(fluent::codegen_ssa_xcrun_command_line_tools_insufficient);
+                        diag.help(inline_fluent!("when compiling for iOS, tvOS, visionOS or watchOS, you need a full installation of Xcode"));
                     }
                 }
             } else {
-                diag.help(fluent::codegen_ssa_xcrun_no_developer_dir);
+                diag.help(inline_fluent!("pass the path of an Xcode installation via the DEVELOPER_DIR environment variable, or an SDK with the SDKROOT environment variable"));
             }
 
             diag.emit();

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -662,7 +662,7 @@ fn link_dwarf_object(sess: &Session, cg_results: &CodegenResults, executable_out
 }
 
 #[derive(LintDiagnostic)]
-#[diag(codegen_ssa_linker_output)]
+#[diag("{$inner}")]
 /// Translating this is kind of useless. We don't pass translation flags to the linker, so we'd just
 /// end up with inconsistent languages within the same diagnostic.
 struct LinkerOutput {