Convert to inline diagnostics in rustc_driver_impl

Cargo.lock

@@ -3789,7 +3789,6 @@ dependencies = [
  "rustc_errors",
  "rustc_expand",
  "rustc_feature",
- "rustc_fluent_macro",
  "rustc_hir_analysis",
  "rustc_hir_pretty",
  "rustc_hir_typeck",

compiler/rustc_driver_impl/Cargo.toml

@@ -21,7 +21,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_analysis = { path = "../rustc_hir_analysis" }
 rustc_hir_pretty = { path = "../rustc_hir_pretty" }
 rustc_hir_typeck = { path = "../rustc_hir_typeck" }

compiler/rustc_driver_impl/messages.ftl

@@ -1,29 +0,0 @@
-driver_impl_cant_emit_mir = could not emit MIR: {$error}
-
-driver_impl_ice = the compiler unexpectedly panicked. this is a bug.
-driver_impl_ice_bug_report = we would appreciate a bug report: {$bug_report_url}
-driver_impl_ice_bug_report_internal_feature = using internal features is not supported and expected to cause internal compiler errors when used incorrectly
-driver_impl_ice_bug_report_update_note = please make sure that you have updated to the latest nightly
-driver_impl_ice_exclude_cargo_defaults = some of the compiler flags provided by cargo are hidden
-
-driver_impl_ice_flags = compiler flags: {$flags}
-driver_impl_ice_path = please attach the file at `{$path}` to your bug report
-driver_impl_ice_path_error = the ICE couldn't be written to `{$path}`: {$error}
-driver_impl_ice_path_error_env = the environment variable `RUSTC_ICE` is set to `{$env_var}`
-driver_impl_ice_version = rustc {$version} running on {$triple}
-
-driver_impl_rlink_corrupt_file = corrupt metadata encountered in `{$file}`
-
-driver_impl_rlink_empty_version_number = the input does not contain version number
-
-driver_impl_rlink_encoding_version_mismatch = .rlink file was produced with encoding version `{$version_array}`, but the current version is `{$rlink_version}`
-
-driver_impl_rlink_no_a_file = rlink must be a file
-
-driver_impl_rlink_rustc_version_mismatch = .rlink file was produced by rustc version `{$rustc_version}`, but the current version is `{$current_version}`
-
-driver_impl_rlink_unable_to_read = failed to read rlink file: `{$err}`
-
-driver_impl_rlink_wrong_file_type = the input does not look like a .rlink file
-
-driver_impl_unstable_feature_usage = cannot dump feature usage metrics: {$error}

compiler/rustc_driver_impl/src/lib.rs

@@ -108,15 +108,12 @@ use crate::session_diagnostics::{
     RLinkWrongFileType, RlinkCorruptFile, RlinkNotAFile, RlinkUnableToRead, UnstableFeatureUsage,
 };
 
-rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
-
 pub fn default_translator() -> Translator {
     Translator::with_fallback_bundle(DEFAULT_LOCALE_RESOURCES.to_vec(), false)
 }
 
 pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
     // tidy-alphabetical-start
-    crate::DEFAULT_LOCALE_RESOURCE,
     rustc_ast_lowering::DEFAULT_LOCALE_RESOURCE,
     rustc_ast_passes::DEFAULT_LOCALE_RESOURCE,
     rustc_attr_parsing::DEFAULT_LOCALE_RESOURCE,

compiler/rustc_driver_impl/src/session_diagnostics.rs

@@ -3,82 +3,88 @@ use std::error::Error;
 use rustc_macros::{Diagnostic, Subdiagnostic};
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_cant_emit_mir)]
+#[diag("could not emit MIR: {$error}")]
 pub struct CantEmitMIR {
     pub error: std::io::Error,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_rlink_unable_to_read)]
+#[diag("failed to read rlink file: `{$err}`")]
 pub(crate) struct RlinkUnableToRead {
     pub err: std::io::Error,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_rlink_wrong_file_type)]
+#[diag("the input does not look like a .rlink file")]
 pub(crate) struct RLinkWrongFileType;
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_rlink_empty_version_number)]
+#[diag("the input does not contain version number")]
 pub(crate) struct RLinkEmptyVersionNumber;
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_rlink_encoding_version_mismatch)]
+#[diag(
+    ".rlink file was produced with encoding version `{$version_array}`, but the current version is `{$rlink_version}`"
+)]
 pub(crate) struct RLinkEncodingVersionMismatch {
     pub version_array: String,
     pub rlink_version: u32,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_rlink_rustc_version_mismatch)]
+#[diag(
+    ".rlink file was produced by rustc version `{$rustc_version}`, but the current version is `{$current_version}`"
+)]
 pub(crate) struct RLinkRustcVersionMismatch<'a> {
     pub rustc_version: String,
     pub current_version: &'a str,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_rlink_no_a_file)]
+#[diag("rlink must be a file")]
 pub(crate) struct RlinkNotAFile;
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_rlink_corrupt_file)]
+#[diag("corrupt metadata encountered in `{$file}`")]
 pub(crate) struct RlinkCorruptFile<'a> {
     pub file: &'a std::path::Path,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice)]
+#[diag("the compiler unexpectedly panicked. this is a bug.")]
 pub(crate) struct Ice;
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_bug_report)]
+#[diag("we would appreciate a bug report: {$bug_report_url}")]
 pub(crate) struct IceBugReport<'a> {
     pub bug_report_url: &'a str,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_bug_report_update_note)]
+#[diag("please make sure that you have updated to the latest nightly")]
 pub(crate) struct UpdateNightlyNote;
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_bug_report_internal_feature)]
+#[diag(
+    "using internal features is not supported and expected to cause internal compiler errors when used incorrectly"
+)]
 pub(crate) struct IceBugReportInternalFeature;
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_version)]
+#[diag("rustc {$version} running on {$triple}")]
 pub(crate) struct IceVersion<'a> {
     pub version: &'a str,
     pub triple: &'a str,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_path)]
+#[diag("please attach the file at `{$path}` to your bug report")]
 pub(crate) struct IcePath {
     pub path: std::path::PathBuf,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_path_error)]
+#[diag("the ICE couldn't be written to `{$path}`: {$error}")]
 pub(crate) struct IcePathError {
     pub path: std::path::PathBuf,
     pub error: String,
@@ -87,23 +93,23 @@ pub(crate) struct IcePathError {
 }
 
 #[derive(Subdiagnostic)]
-#[note(driver_impl_ice_path_error_env)]
+#[note("the environment variable `RUSTC_ICE` is set to `{$env_var}`")]
 pub(crate) struct IcePathErrorEnv {
     pub env_var: std::path::PathBuf,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_flags)]
+#[diag("compiler flags: {$flags}")]
 pub(crate) struct IceFlags {
     pub flags: String,
 }
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_ice_exclude_cargo_defaults)]
+#[diag("some of the compiler flags provided by cargo are hidden")]
 pub(crate) struct IceExcludeCargoDefaults;
 
 #[derive(Diagnostic)]
-#[diag(driver_impl_unstable_feature_usage)]
+#[diag("cannot dump feature usage metrics: {$error}")]
 pub(crate) struct UnstableFeatureUsage {
     pub error: Box<dyn Error>,
 }