Convert to inline diagnostics in rustc_mir_dataflow

Author: JonathanBrouwer

Cargo.lock

@@ -3803,7 +3803,6 @@ dependencies = [
  "rustc_metadata",
  "rustc_middle",
  "rustc_mir_build",
- "rustc_mir_dataflow",
  "rustc_mir_transform",
  "rustc_monomorphize",
  "rustc_parse",
@@ -4340,7 +4339,6 @@ dependencies = [
  "rustc_ast",
  "rustc_data_structures",
  "rustc_errors",
- "rustc_fluent_macro",
  "rustc_graphviz",
  "rustc_index",
  "rustc_macros",

compiler/rustc_driver_impl/Cargo.toml

@@ -35,7 +35,6 @@ rustc_macros = { path = "../rustc_macros" }
 rustc_metadata = { path = "../rustc_metadata" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_mir_build = { path = "../rustc_mir_build" }
-rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
 rustc_mir_transform = { path = "../rustc_mir_transform" }
 rustc_monomorphize = { path = "../rustc_monomorphize" }
 rustc_parse = { path = "../rustc_parse" }

compiler/rustc_driver_impl/src/lib.rs

@@ -132,7 +132,6 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
     rustc_metadata::DEFAULT_LOCALE_RESOURCE,
     rustc_middle::DEFAULT_LOCALE_RESOURCE,
     rustc_mir_build::DEFAULT_LOCALE_RESOURCE,
-    rustc_mir_dataflow::DEFAULT_LOCALE_RESOURCE,
     rustc_mir_transform::DEFAULT_LOCALE_RESOURCE,
     rustc_monomorphize::DEFAULT_LOCALE_RESOURCE,
     rustc_parse::DEFAULT_LOCALE_RESOURCE,

compiler/rustc_mir_dataflow/Cargo.toml

@@ -11,7 +11,6 @@ rustc_abi = { path = "../rustc_abi" }
 rustc_ast = { path = "../rustc_ast" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
-rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 rustc_graphviz = { path = "../rustc_graphviz" }
 rustc_index = { path = "../rustc_index" }
 rustc_macros = { path = "../rustc_macros" }

compiler/rustc_mir_dataflow/messages.ftl

@@ -2,69 +2,69 @@ use rustc_macros::Diagnostic;
 use rustc_span::{Span, Symbol};
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_path_must_end_in_filename)]
+#[diag("path must end in a filename")]
 pub(crate) struct PathMustEndInFilename {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_unknown_formatter)]
+#[diag("unknown formatter")]
 pub(crate) struct UnknownFormatter {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_duplicate_values_for)]
+#[diag("duplicate values for `{$name}`")]
 pub(crate) struct DuplicateValuesFor {
     #[primary_span]
     pub span: Span,
     pub name: Symbol,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_requires_an_argument)]
+#[diag("`{$name}` requires an argument")]
 pub(crate) struct RequiresAnArgument {
     #[primary_span]
     pub span: Span,
     pub name: Symbol,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_stop_after_dataflow_ended_compilation)]
+#[diag("stop_after_dataflow ended compilation")]
 pub(crate) struct StopAfterDataFlowEndedCompilation;
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_peek_must_be_place_or_ref_place)]
+#[diag("rustc_peek: argument expression must be either `place` or `&place`")]
 pub(crate) struct PeekMustBePlaceOrRefPlace {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_peek_must_be_not_temporary)]
+#[diag("dataflow::sanity_check cannot feed a non-temp to rustc_peek")]
 pub(crate) struct PeekMustBeNotTemporary {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_peek_bit_not_set)]
+#[diag("rustc_peek: bit not set")]
 pub(crate) struct PeekBitNotSet {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_peek_argument_not_a_local)]
+#[diag("rustc_peek: argument was not a local")]
 pub(crate) struct PeekArgumentNotALocal {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(mir_dataflow_peek_argument_untracked)]
+#[diag("rustc_peek: argument untracked")]
 pub(crate) struct PeekArgumentUntracked {
     #[primary_span]
     pub span: Span,

compiler/rustc_mir_dataflow/src/errors.rs

@@ -34,8 +34,6 @@ pub mod rustc_peek;
 mod un_derefer;
 pub mod value_analysis;
 
-rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
-
 pub struct MoveDataTypingEnv<'tcx> {
     pub move_data: MoveData<'tcx>,
     pub typing_env: ty::TypingEnv<'tcx>,