Auto merge of #152089 - JonathanBrouwer:rollup-h74gaTC, r=JonathanBrouwer

Rollup of 5 pull requests

Successful merges:

 - #151893 (Move the query list into a new `rustc_middle::queries` module)
 - #152060 (ci: Optimize loongarch64-linux dist builders)
 - #151993 (Add uv to the list of possible python runners)
 - #152047 (Convert to inline diagnostics in `rustc_interface`)
 - #152053 (Avoid semicolon suggestion when tail expr is error)

Failed merges:

 - #152023 (Some `rustc_query_system` cleanups)

Author: bors

Cargo.lock

@@ -4114,7 +4114,6 @@ dependencies = [
  "rustc_errors",
  "rustc_expand",
  "rustc_feature",
- "rustc_fluent_macro",
  "rustc_fs_util",
  "rustc_hir",
  "rustc_hir_analysis",

compiler/rustc_driver_impl/src/lib.rs

@@ -124,7 +124,6 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
     rustc_expand::DEFAULT_LOCALE_RESOURCE,
     rustc_hir_analysis::DEFAULT_LOCALE_RESOURCE,
     rustc_hir_typeck::DEFAULT_LOCALE_RESOURCE,
-    rustc_interface::DEFAULT_LOCALE_RESOURCE,
     rustc_lint::DEFAULT_LOCALE_RESOURCE,
     rustc_metadata::DEFAULT_LOCALE_RESOURCE,
     rustc_middle::DEFAULT_LOCALE_RESOURCE,

compiler/rustc_interface/Cargo.toml

@@ -19,7 +19,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_fs_util = { path = "../rustc_fs_util" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_hir_analysis = { path = "../rustc_hir_analysis" }

compiler/rustc_interface/messages.ftl

@@ -7,7 +7,9 @@ use rustc_span::{Span, Symbol};
 use rustc_target::spec::TargetTuple;
 
 #[derive(Diagnostic)]
-#[diag(interface_crate_name_does_not_match)]
+#[diag(
+    "`--crate-name` and `#[crate_name]` are required to match, but `{$crate_name}` != `{$attr_crate_name}`"
+)]
 pub(crate) struct CrateNameDoesNotMatch {
     #[primary_span]
     pub(crate) span: Span,
@@ -16,110 +18,124 @@ pub(crate) struct CrateNameDoesNotMatch {
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_crate_name_invalid)]
+#[diag("crate names cannot start with a `-`, but `{$crate_name}` has a leading hyphen")]
 pub(crate) struct CrateNameInvalid<'a> {
     pub(crate) crate_name: &'a str,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_ferris_identifier)]
+#[diag("Ferris cannot be used as an identifier")]
 pub struct FerrisIdentifier {
     #[primary_span]
     pub spans: Vec<Span>,
-    #[suggestion(code = "{ferris_fix}", applicability = "maybe-incorrect")]
+    #[suggestion(
+        "try using their name instead",
+        code = "{ferris_fix}",
+        applicability = "maybe-incorrect"
+    )]
     pub first_span: Span,
     pub ferris_fix: &'static str,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_emoji_identifier)]
+#[diag("identifiers cannot contain emoji: `{$ident}`")]
 pub struct EmojiIdentifier {
     #[primary_span]
     pub spans: Vec<Span>,
     pub ident: Symbol,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_mixed_bin_crate)]
+#[diag("cannot mix `bin` crate type with others")]
 pub struct MixedBinCrate;
 
 #[derive(Diagnostic)]
-#[diag(interface_mixed_proc_macro_crate)]
+#[diag("cannot mix `proc-macro` crate type with others")]
 pub struct MixedProcMacroCrate;
 
 #[derive(Diagnostic)]
-#[diag(interface_error_writing_dependencies)]
+#[diag("error writing dependencies to `{$path}`: {$error}")]
 pub struct ErrorWritingDependencies<'a> {
     pub path: &'a Path,
     pub error: io::Error,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_input_file_would_be_overwritten)]
+#[diag("the input file \"{$path}\" would be overwritten by the generated executable")]
 pub struct InputFileWouldBeOverWritten<'a> {
     pub path: &'a Path,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_generated_file_conflicts_with_directory)]
+#[diag(
+    "the generated executable for the input file \"{$input_path}\" conflicts with the existing directory \"{$dir_path}\""
+)]
 pub struct GeneratedFileConflictsWithDirectory<'a> {
     pub input_path: &'a Path,
     pub dir_path: &'a Path,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_temps_dir_error)]
+#[diag("failed to find or create the directory specified by `--temps-dir`")]
 pub struct TempsDirError;
 
 #[derive(Diagnostic)]
-#[diag(interface_out_dir_error)]
+#[diag("failed to find or create the directory specified by `--out-dir`")]
 pub struct OutDirError;
 
 #[derive(Diagnostic)]
-#[diag(interface_failed_writing_file)]
+#[diag("failed to write file {$path}: {$error}\"")]
 pub struct FailedWritingFile<'a> {
     pub path: &'a Path,
     pub error: io::Error,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_proc_macro_crate_panic_abort)]
+#[diag(
+    "building proc macro crate with `panic=abort` or `panic=immediate-abort` may crash the compiler should the proc-macro panic"
+)]
 pub struct ProcMacroCratePanicAbort;
 
 #[derive(Diagnostic)]
-#[diag(interface_multiple_output_types_adaption)]
+#[diag(
+    "due to multiple output types requested, the explicitly specified output file name will be adapted for each output type"
+)]
 pub struct MultipleOutputTypesAdaption;
 
 #[derive(Diagnostic)]
-#[diag(interface_ignoring_extra_filename)]
+#[diag("ignoring -C extra-filename flag due to -o flag")]
 pub struct IgnoringExtraFilename;
 
 #[derive(Diagnostic)]
-#[diag(interface_ignoring_out_dir)]
+#[diag("ignoring --out-dir flag due to -o flag")]
 pub struct IgnoringOutDir;
 
 #[derive(Diagnostic)]
-#[diag(interface_multiple_output_types_to_stdout)]
+#[diag("can't use option `-o` or `--emit` to write multiple output types to stdout")]
 pub struct MultipleOutputTypesToStdout;
 
 #[derive(Diagnostic)]
-#[diag(interface_abi_required_feature)]
-#[note]
-#[note(interface_abi_required_feature_issue)]
+#[diag(
+    "target feature `{$feature}` must be {$enabled} to ensure that the ABI of the current target can be implemented correctly"
+)]
+#[note(
+    "this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!"
+)]
+#[note("for more information, see issue #116344 <https://github.com/rust-lang/rust/issues/116344>")]
 pub(crate) struct AbiRequiredTargetFeature<'a> {
     pub feature: &'a str,
     pub enabled: &'a str,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_unsupported_crate_type_for_codegen_backend)]
+#[diag("dropping unsupported crate type `{$crate_type}` for codegen backend `{$codegen_backend}`")]
 pub(crate) struct UnsupportedCrateTypeForCodegenBackend {
     pub(crate) crate_type: CrateType,
     pub(crate) codegen_backend: &'static str,
 }
 
 #[derive(Diagnostic)]
-#[diag(interface_unsupported_crate_type_for_target)]
+#[diag("dropping unsupported crate type `{$crate_type}` for target `{$target_triple}`")]
 pub(crate) struct UnsupportedCrateTypeForTarget<'a> {
     pub(crate) crate_type: CrateType,
     pub(crate) target_triple: &'a TargetTuple,

compiler/rustc_interface/src/errors.rs

@@ -55,11 +55,7 @@ pub(crate) fn parse_cfg(dcx: DiagCtxtHandle<'_>, cfgs: Vec<String>) -> Cfg {
     cfgs.into_iter()
         .map(|s| {
             let psess = ParseSess::emitter_with_note(
-                vec![
-                    crate::DEFAULT_LOCALE_RESOURCE,
-                    rustc_parse::DEFAULT_LOCALE_RESOURCE,
-                    rustc_session::DEFAULT_LOCALE_RESOURCE,
-                ],
+                vec![rustc_parse::DEFAULT_LOCALE_RESOURCE, rustc_session::DEFAULT_LOCALE_RESOURCE],
                 format!("this occurred on the command line: `--cfg={s}`"),
             );
             let filename = FileName::cfg_spec_source_code(&s);
@@ -131,11 +127,7 @@ pub(crate) fn parse_check_cfg(dcx: DiagCtxtHandle<'_>, specs: Vec<String>) -> Ch
 
     for s in specs {
         let psess = ParseSess::emitter_with_note(
-            vec![
-                crate::DEFAULT_LOCALE_RESOURCE,
-                rustc_parse::DEFAULT_LOCALE_RESOURCE,
-                rustc_session::DEFAULT_LOCALE_RESOURCE,
-            ],
+            vec![rustc_parse::DEFAULT_LOCALE_RESOURCE, rustc_session::DEFAULT_LOCALE_RESOURCE],
             format!("this occurred on the command line: `--check-cfg={s}`"),
         );
         let filename = FileName::cfg_spec_source_code(&s);

compiler/rustc_interface/src/interface.rs

@@ -21,5 +21,3 @@ pub use queries::Linker;
 
 #[cfg(test)]
 mod tests;
-
-rustc_fluent_macro::fluent_messages! { "../messages.ftl" }

compiler/rustc_interface/src/lib.rs

@@ -289,7 +289,7 @@ fn add_query_desc_cached_impl(
         cached.extend(quote! {
             #[allow(unused_variables, unused_braces, rustc::pass_by_value)]
             #[inline]
-            pub fn #name<'tcx>(#tcx: TyCtxt<'tcx>, #key: &crate::query::queries::#name::Key<'tcx>) -> bool {
+            pub fn #name<'tcx>(#tcx: TyCtxt<'tcx>, #key: &crate::queries::#name::Key<'tcx>) -> bool {
                 #ra_hint
                 #expr
             }
@@ -301,7 +301,7 @@ fn add_query_desc_cached_impl(
 
     let desc = quote! {
         #[allow(unused_variables)]
-        pub fn #name<'tcx>(tcx: TyCtxt<'tcx>, key: crate::query::queries::#name::Key<'tcx>) -> String {
+        pub fn #name<'tcx>(tcx: TyCtxt<'tcx>, key: crate::queries::#name::Key<'tcx>) -> String {
             let (#tcx, #key) = (tcx, key);
             format!(#desc)
         }

compiler/rustc_macros/src/query.rs

@@ -11,7 +11,8 @@ use rustc_middle::bug;
 use rustc_middle::metadata::{AmbigModChild, ModChild};
 use rustc_middle::middle::exported_symbols::ExportedSymbol;
 use rustc_middle::middle::stability::DeprecationEntry;
-use rustc_middle::query::{ExternProviders, LocalCrate};
+use rustc_middle::queries::ExternProviders;
+use rustc_middle::query::LocalCrate;
 use rustc_middle::ty::fast_reject::SimplifiedType;
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_middle::util::Providers;
@@ -134,8 +135,8 @@ macro_rules! provide_one {
     ($tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $name:ident => $compute:block) => {
         fn $name<'tcx>(
             $tcx: TyCtxt<'tcx>,
-            def_id_arg: rustc_middle::query::queries::$name::Key<'tcx>,
-        ) -> rustc_middle::query::queries::$name::ProvidedValue<'tcx> {
+            def_id_arg: rustc_middle::queries::$name::Key<'tcx>,
+        ) -> rustc_middle::queries::$name::ProvidedValue<'tcx> {
             let _prof_timer =
                 $tcx.prof.generic_activity(concat!("metadata_decode_entry_", stringify!($name)));
 

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -86,6 +86,8 @@ mod values;
 #[macro_use]
 pub mod query;
 #[macro_use]
+pub mod queries;
+#[macro_use]
 pub mod dep_graph;
 
 // Allows macros to refer to this crate as `::rustc_middle`