Unrolled build for #152250

Rollup merge of #152250 - JonathanBrouwer:convert_finish, r=jdonszelmann

Remove support for slugs in diagnostic messages

This PR contains 5 commits, and is best reviewed commit-by-commit:
- ea87331 Removes support from slugs from `rustc_errors`
- 62dd371 Removes support from slugs from `rustc_macros` (which declares `derive(Diagnostic)`)
- 2289e6c Adjuist the `ui-fulldeps` testsuite to match the changes in `rustc_macros`
- 0db0acd Removes support for the fallback bundle (which previously contained all messages, but is now empty) from `rustc_driver_impl` and `rustc_session`
- 81d4214 Removes an integration test that tested the translation system using fluent

Author: rust-timer

compiler/rustc_driver_impl/src/lib.rs

@@ -108,11 +108,9 @@ use crate::session_diagnostics::{
 };
 
 pub fn default_translator() -> Translator {
-    Translator::with_fallback_bundle(DEFAULT_LOCALE_RESOURCES.to_vec(), false)
+    Translator::new()
 }
 
-pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[];
-
 /// Exit status code used for successful compilation and help output.
 pub const EXIT_SUCCESS: i32 = 0;
 
@@ -219,7 +217,6 @@ pub fn run_compiler(at_args: &[String], callbacks: &mut (dyn Callbacks + Send))
         output_dir: odir,
         ice_file,
         file_loader: None,
-        locale_resources: DEFAULT_LOCALE_RESOURCES.to_vec(),
         lint_caps: Default::default(),
         psess_created: None,
         hash_untracked_state: None,
@@ -1528,7 +1525,7 @@ fn report_ice(
     extra_info: fn(&DiagCtxt),
     using_internal_features: &AtomicBool,
 ) {
-    let translator = default_translator();
+    let translator = Translator::new();
     let emitter =
         Box::new(rustc_errors::annotate_snippet_emitter_writer::AnnotateSnippetEmitter::new(
             stderr_destination(rustc_errors::ColorConfig::Auto),

compiler/rustc_error_messages/src/lib.rs

@@ -230,9 +230,6 @@ pub fn fallback_fluent_bundle(
     })))
 }
 
-/// Identifier for the Fluent message/attribute corresponding to a diagnostic message.
-type FluentId = Cow<'static, str>;
-
 /// Abstraction over a message in a subdiagnostic (i.e. label, note, help, etc) to support both
 /// translatable and non-translatable diagnostic messages.
 ///
@@ -244,18 +241,9 @@ type FluentId = Cow<'static, str>;
 pub enum SubdiagMessage {
     /// Non-translatable diagnostic message.
     Str(Cow<'static, str>),
-    /// Identifier of a Fluent message. Instances of this variant are generated by the
-    /// `Subdiagnostic` derive.
-    FluentIdentifier(FluentId),
     /// An inline Fluent message. Instances of this variant are generated by the
     /// `Subdiagnostic` derive.
     Inline(Cow<'static, str>),
-    /// Attribute of a Fluent message. Needs to be combined with a Fluent identifier to produce an
-    /// actual translated message. Instances of this variant are generated by the `fluent_messages`
-    /// macro.
-    ///
-    /// <https://projectfluent.org/fluent/guide/attributes.html>
-    FluentAttr(FluentId),
 }
 
 impl From<String> for SubdiagMessage {
@@ -288,12 +276,6 @@ pub enum DiagMessage {
     /// are translated when they are added to the parent diagnostic. This is one of the ways
     /// this variant of `DiagMessage` is produced.
     Str(Cow<'static, str>),
-    /// Identifier for a Fluent message (with optional attribute) corresponding to the diagnostic
-    /// message. Yet to be translated.
-    ///
-    /// <https://projectfluent.org/fluent/guide/hello.html>
-    /// <https://projectfluent.org/fluent/guide/attributes.html>
-    FluentIdentifier(FluentId, Option<FluentId>),
     /// An inline Fluent message, containing the to be translated diagnostic message.
     Inline(Cow<'static, str>),
 }
@@ -305,27 +287,16 @@ impl DiagMessage {
     /// - If the `SubdiagMessage` is non-translatable then return the message as a `DiagMessage`.
     /// - If `self` is non-translatable then return `self`'s message.
     pub fn with_subdiagnostic_message(&self, sub: SubdiagMessage) -> Self {
-        let attr = match sub {
-            SubdiagMessage::Str(s) => return DiagMessage::Str(s),
-            SubdiagMessage::FluentIdentifier(id) => {
-                return DiagMessage::FluentIdentifier(id, None);
-            }
-            SubdiagMessage::Inline(s) => return DiagMessage::Inline(s),
-            SubdiagMessage::FluentAttr(attr) => attr,
-        };
-
-        match self {
-            DiagMessage::FluentIdentifier(id, _) => {
-                DiagMessage::FluentIdentifier(id.clone(), Some(attr))
-            }
-            _ => panic!("Tried to add a subdiagnostic to a message without a fluent identifier"),
+        match sub {
+            SubdiagMessage::Str(s) => DiagMessage::Str(s),
+            SubdiagMessage::Inline(s) => DiagMessage::Inline(s),
         }
     }
 
     pub fn as_str(&self) -> Option<&str> {
         match self {
             DiagMessage::Str(s) => Some(s),
-            DiagMessage::FluentIdentifier(_, _) | DiagMessage::Inline(_) => None,
+            DiagMessage::Inline(_) => None,
         }
     }
 }
@@ -355,10 +326,6 @@ impl From<DiagMessage> for SubdiagMessage {
     fn from(val: DiagMessage) -> Self {
         match val {
             DiagMessage::Str(s) => SubdiagMessage::Str(s),
-            DiagMessage::FluentIdentifier(id, None) => SubdiagMessage::FluentIdentifier(id),
-            // There isn't really a sensible behaviour for this because it loses information but
-            // this is the most sensible of the behaviours.
-            DiagMessage::FluentIdentifier(_, Some(attr)) => SubdiagMessage::FluentAttr(attr),
             DiagMessage::Inline(s) => SubdiagMessage::Inline(s),
         }
     }

compiler/rustc_errors/src/json/tests.rs

@@ -45,7 +45,7 @@ fn test_positions(code: &str, span: (u32, u32), expected_output: SpanTestData) {
     rustc_span::create_default_session_globals_then(|| {
         let sm = Arc::new(SourceMap::new(FilePathMapping::empty()));
         sm.new_source_file(filename(&sm, "test.rs"), code.to_owned());
-        let translator = Translator::with_fallback_bundle(vec![], false);
+        let translator = Translator::new();
 
         let output = Arc::new(Mutex::new(Vec::new()));
         let je = JsonEmitter::new(

compiler/rustc_errors/src/lib.rs

@@ -83,8 +83,6 @@ pub mod error;
 pub mod json;
 mod lock;
 pub mod markdown;
-#[cfg(test)]
-mod tests;
 pub mod timings;
 pub mod translation;