From 7e2ecb3cd84eae18e838624feeb2e5cf46b9cc57 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 3 Mar 2023 00:18:38 +0100
Subject: Simplify message paths

This makes it easier to open the messages file while developing on features.

The commit was the result of automatted changes:

for p in compiler/rustc_*; do mv $p/locales/en-US.ftl $p/messages.ftl; rmdir $p/locales; done

for p in compiler/rustc_*; do sed -i "s#\.\./locales/en-US.ftl#../messages.ftl#" $p/src/lib.rs; done
---
 compiler/rustc_mir_dataflow/locales/en-US.ftl | 29 ---------------------------
 compiler/rustc_mir_dataflow/messages.ftl      | 29 +++++++++++++++++++++++++++
 compiler/rustc_mir_dataflow/src/lib.rs        |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 compiler/rustc_mir_dataflow/locales/en-US.ftl
 create mode 100644 compiler/rustc_mir_dataflow/messages.ftl

(limited to 'compiler/rustc_mir_dataflow')

diff --git a/compiler/rustc_mir_dataflow/locales/en-US.ftl b/compiler/rustc_mir_dataflow/locales/en-US.ftl
deleted file mode 100644
index 98854152508..00000000000
--- a/compiler/rustc_mir_dataflow/locales/en-US.ftl
+++ /dev/null
@@ -1,29 +0,0 @@
-mir_dataflow_path_must_end_in_filename =
-    path must end in a filename
-
-mir_dataflow_unknown_formatter =
-    unknown formatter
-
-mir_dataflow_duplicate_values_for =
-    duplicate values for `{$name}`
-
-mir_dataflow_requires_an_argument =
-    `{$name}` requires an argument
-
-mir_dataflow_stop_after_dataflow_ended_compilation =
-    stop_after_dataflow ended compilation
-
-mir_dataflow_peek_must_be_place_or_ref_place =
-    rustc_peek: argument expression must be either `place` or `&place`
-
-mir_dataflow_peek_must_be_not_temporary =
-    dataflow::sanity_check cannot feed a non-temp to rustc_peek
-
-mir_dataflow_peek_bit_not_set =
-    rustc_peek: bit not set
-
-mir_dataflow_peek_argument_not_a_local =
-    rustc_peek: argument was not a local
-
-mir_dataflow_peek_argument_untracked =
-    rustc_peek: argument untracked
diff --git a/compiler/rustc_mir_dataflow/messages.ftl b/compiler/rustc_mir_dataflow/messages.ftl
new file mode 100644
index 00000000000..98854152508
--- /dev/null
+++ b/compiler/rustc_mir_dataflow/messages.ftl
@@ -0,0 +1,29 @@
+mir_dataflow_path_must_end_in_filename =
+    path must end in a filename
+
+mir_dataflow_unknown_formatter =
+    unknown formatter
+
+mir_dataflow_duplicate_values_for =
+    duplicate values for `{$name}`
+
+mir_dataflow_requires_an_argument =
+    `{$name}` requires an argument
+
+mir_dataflow_stop_after_dataflow_ended_compilation =
+    stop_after_dataflow ended compilation
+
+mir_dataflow_peek_must_be_place_or_ref_place =
+    rustc_peek: argument expression must be either `place` or `&place`
+
+mir_dataflow_peek_must_be_not_temporary =
+    dataflow::sanity_check cannot feed a non-temp to rustc_peek
+
+mir_dataflow_peek_bit_not_set =
+    rustc_peek: bit not set
+
+mir_dataflow_peek_argument_not_a_local =
+    rustc_peek: argument was not a local
+
+mir_dataflow_peek_argument_untracked =
+    rustc_peek: argument untracked
diff --git a/compiler/rustc_mir_dataflow/src/lib.rs b/compiler/rustc_mir_dataflow/src/lib.rs
index b1e03faff05..4ed6f7e90ff 100644
--- a/compiler/rustc_mir_dataflow/src/lib.rs
+++ b/compiler/rustc_mir_dataflow/src/lib.rs
@@ -46,7 +46,7 @@ pub mod storage;
 pub mod un_derefer;
 pub mod value_analysis;
 
-fluent_messages! { "../locales/en-US.ftl" }
+fluent_messages! { "../messages.ftl" }
 
 pub(crate) mod indexes {
     pub(crate) use super::move_paths::MovePathIndex;
-- 
cgit 1.4.1-3-g733a5