Rollup merge of rust-lang#152235 - JonathanBrouwer:convert_parse, r=JonathanBrouwer

Convert to inline diagnostics in `rustc_parse`

This was the most annoying one by far, had to make a few changes to the representation of two errors (no user-facing changes tho), these changes are in separate commits for clarity :)

For rust-lang#151366
r? @jdonszelmann

Author: JonathanBrouwer

Cargo.lock

@@ -4381,7 +4381,6 @@ dependencies = [
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
- "rustc_fluent_macro",
  "rustc_index",
  "rustc_lexer",
  "rustc_macros",

compiler/rustc_codegen_llvm/src/errors.rs

@@ -214,5 +214,5 @@ pub(crate) struct FixedX18InvalidArch<'a> {
 }
 
 #[derive(Diagnostic)]
-#[diag("`-Zsanitizer-kcfi-arity` requires LLVM 21.0.0 or later.")]
+#[diag("`-Zsanitizer-kcfi-arity` requires LLVM 21.0.0 or later")]
 pub(crate) struct SanitizerKcfiArityRequiresLLVM2100;

compiler/rustc_codegen_ssa/src/errors.rs

@@ -59,7 +59,7 @@ pub(crate) struct MissingQueryDepGraph {
 
 #[derive(Diagnostic)]
 #[diag(
-    "found malformed codegen unit name `{$user_path}`. codegen units names must always start with the name of the crate (`{$crate_name}` in this case)."
+    "found malformed codegen unit name `{$user_path}`. codegen units names must always start with the name of the crate (`{$crate_name}` in this case)"
 )]
 pub(crate) struct MalformedCguName {
     #[primary_span]
@@ -562,12 +562,12 @@ pub(crate) struct SelfContainedLinkerMissing;
 
 #[derive(Diagnostic)]
 #[diag(
-    "please ensure that Visual Studio 2017 or later, or Build Tools for Visual Studio were installed with the Visual C++ option."
+    "please ensure that Visual Studio 2017 or later, or Build Tools for Visual Studio were installed with the Visual C++ option"
 )]
 pub(crate) struct CheckInstalledVisualStudio;
 
 #[derive(Diagnostic)]
-#[diag("VS Code is a different product, and is not sufficient.")]
+#[diag("VS Code is a different product, and is not sufficient")]
 pub(crate) struct InsufficientVSCodeProduct;
 
 #[derive(Diagnostic)]
@@ -610,13 +610,13 @@ pub(crate) struct LinkerFileStem;
 
 #[derive(Diagnostic)]
 #[diag(
-    "link against the following native artifacts when linking against this static library. The order and any duplication can be significant on some platforms."
+    "link against the following native artifacts when linking against this static library. The order and any duplication can be significant on some platforms"
 )]
 pub(crate) struct StaticLibraryNativeArtifacts;
 
 #[derive(Diagnostic)]
 #[diag(
-    "native artifacts to link against have been written to {$path}. The order and any duplication can be significant on some platforms."
+    "native artifacts to link against have been written to {$path}. The order and any duplication can be significant on some platforms"
 )]
 pub(crate) struct StaticLibraryNativeArtifactsToFile<'a> {
     pub path: &'a Path,

compiler/rustc_const_eval/src/errors.rs

@@ -309,7 +309,7 @@ pub(crate) struct UnallowedHeapAllocations {
     pub span: Span,
     pub kind: ConstContext,
     #[note(
-        "The runtime heap is not yet available at compile-time, so no runtime heap allocations can be created."
+        "the runtime heap is not yet available at compile-time, so no runtime heap allocations can be created"
     )]
     pub teach: bool,
 }
@@ -347,7 +347,7 @@ pub(crate) struct InteriorMutableBorrowEscaping {
 #[diag("constant evaluation is taking a long time")]
 #[note(
     "this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
-    If your compilation actually takes a long time, you can safely allow the lint."
+    If your compilation actually takes a long time, you can safely allow the lint"
 )]
 pub struct LongRunning {
     #[help("the constant being evaluated")]

compiler/rustc_driver_impl/src/lib.rs

@@ -114,7 +114,6 @@ pub fn default_translator() -> Translator {
 pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
     // tidy-alphabetical-start
     rustc_lint::DEFAULT_LOCALE_RESOURCE,
-    rustc_parse::DEFAULT_LOCALE_RESOURCE,
     // tidy-alphabetical-end
 ];
 

compiler/rustc_driver_impl/src/session_diagnostics.rs

@@ -51,7 +51,7 @@ pub(crate) struct RlinkCorruptFile<'a> {
 }
 
 #[derive(Diagnostic)]
-#[diag("the compiler unexpectedly panicked. this is a bug.")]
+#[diag("the compiler unexpectedly panicked. This is a bug")]
 pub(crate) struct Ice;
 
 #[derive(Diagnostic)]

compiler/rustc_hir_typeck/src/errors.rs

@@ -1145,7 +1145,7 @@ pub(crate) struct CastThinPointerToWidePointer<'tcx> {
     pub expr_ty: Ty<'tcx>,
     pub cast_ty: Ty<'tcx>,
     #[note(
-        "Thin pointers are \"simple\" pointers: they are purely a reference to a
+        "thin pointers are \"simple\" pointers: they are purely a reference to a
         memory address.
 
         Wide pointers are pointers referencing \"Dynamically Sized Types\" (also

compiler/rustc_incremental/src/errors.rs

@@ -281,7 +281,7 @@ pub(crate) struct DeleteWorkProduct<'a> {
 
 #[derive(Diagnostic)]
 #[diag(
-    "corrupt incremental compilation artifact found at `{$path}`. This file will automatically be ignored and deleted. If you see this message repeatedly or can provoke it without manually manipulating the compiler's artifacts, please file an issue. The incremental compilation system relies on hardlinks and filesystem locks behaving correctly, and may not deal well with OS crashes, so whatever information you can provide about your filesystem or other state may be very relevant."
+    "corrupt incremental compilation artifact found at `{$path}`. This file will automatically be ignored and deleted. If you see this message repeatedly or can provoke it without manually manipulating the compiler's artifacts, please file an issue. The incremental compilation system relies on hardlinks and filesystem locks behaving correctly, and may not deal well with OS crashes, so whatever information you can provide about your filesystem or other state may be very relevant"
 )]
 pub(crate) struct CorruptFile<'a> {
     pub path: &'a Path,

compiler/rustc_interface/src/interface.rs

@@ -53,10 +53,9 @@ pub struct Compiler {
 pub(crate) fn parse_cfg(dcx: DiagCtxtHandle<'_>, cfgs: Vec<String>) -> Cfg {
     cfgs.into_iter()
         .map(|s| {
-            let psess = ParseSess::emitter_with_note(
-                vec![rustc_parse::DEFAULT_LOCALE_RESOURCE],
-                format!("this occurred on the command line: `--cfg={s}`"),
-            );
+            let psess = ParseSess::emitter_with_note(format!(
+                "this occurred on the command line: `--cfg={s}`"
+            ));
             let filename = FileName::cfg_spec_source_code(&s);
 
             macro_rules! error {
@@ -125,10 +124,9 @@ pub(crate) fn parse_check_cfg(dcx: DiagCtxtHandle<'_>, specs: Vec<String>) -> Ch
     let mut check_cfg = CheckCfg { exhaustive_names, exhaustive_values, ..CheckCfg::default() };
 
     for s in specs {
-        let psess = ParseSess::emitter_with_note(
-            vec![rustc_parse::DEFAULT_LOCALE_RESOURCE],
-            format!("this occurred on the command line: `--check-cfg={s}`"),
-        );
+        let psess = ParseSess::emitter_with_note(format!(
+            "this occurred on the command line: `--check-cfg={s}`"
+        ));
         let filename = FileName::cfg_spec_source_code(&s);
 
         const VISIT: &str =

compiler/rustc_macros/src/diagnostics/message.rs

@@ -3,6 +3,7 @@ use fluent_syntax::ast::{Expression, InlineExpression, Pattern, PatternElement};
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::Path;
+use syn::ext::IdentExt;
 use synstructure::{Structure, VariantInfo};
 
 use crate::diagnostics::error::span_err;
@@ -23,9 +24,7 @@ impl Message {
                 quote! { crate::fluent_generated::#slug }
             }
             Message::Inline(message_span, message) => {
-                if let Some(variant) = variant {
-                    verify_fluent_message(*message_span, &message, variant);
-                }
+                verify_fluent_message(*message_span, &message, variant);
                 quote! { rustc_errors::DiagMessage::Inline(std::borrow::Cow::Borrowed(#message)) }
             }
         }
@@ -86,30 +85,37 @@ impl Message {
     }
 }
 
-fn verify_fluent_message(msg_span: Span, message: &str, variant: &VariantInfo<'_>) {
+fn verify_fluent_message(msg_span: Span, message_str: &str, variant: Option<&VariantInfo<'_>>) {
     // Parse the fluent message
     const GENERATED_MSG_ID: &str = "generated_msg";
-    let resource = FluentResource::try_new(format!("{GENERATED_MSG_ID} = {message}\n")).unwrap();
+    let resource =
+        FluentResource::try_new(format!("{GENERATED_MSG_ID} = {message_str}\n")).unwrap();
     assert_eq!(resource.entries().count(), 1);
     let Some(fluent_syntax::ast::Entry::Message(message)) = resource.get_entry(0) else {
         panic!("Did not parse into a message")
     };
 
     // Check if all variables are used
-    let fields: Vec<String> = variant
-        .bindings()
-        .iter()
-        .flat_map(|b| b.ast().ident.as_ref())
-        .map(|id| id.to_string())
-        .collect();
-    for variable in variable_references(&message) {
-        if !fields.iter().any(|f| f == variable) {
-            span_err(msg_span.unwrap(), format!("Variable `{variable}` not found in diagnostic "))
+    if let Some(variant) = variant {
+        let fields: Vec<String> = variant
+            .bindings()
+            .iter()
+            .flat_map(|b| b.ast().ident.as_ref())
+            .map(|id| id.unraw().to_string())
+            .collect();
+        for variable in variable_references(&message) {
+            if !fields.iter().any(|f| f == variable) {
+                span_err(
+                    msg_span.unwrap(),
+                    format!("Variable `{variable}` not found in diagnostic "),
+                )
                 .help(format!("Available fields: {:?}", fields.join(", ")))
                 .emit();
+            }
         }
-        // assert!(, );
     }
+
+    verify_message_style(msg_span, message_str);
 }
 
 fn variable_references<'a>(msg: &fluent_syntax::ast::Message<&'a str>) -> Vec<&'a str> {
@@ -136,3 +142,42 @@ fn variable_references<'a>(msg: &fluent_syntax::ast::Message<&'a str>) -> Vec<&'
     }
     refs
 }
+
+const ALLOWED_CAPITALIZED_WORDS: &[&str] = &[
+    // tidy-alphabetical-start
+    "ABI",
+    "ABIs",
+    "ADT",
+    "C-variadic",
+    "CGU-reuse",
+    "Cargo",
+    "Ferris",
+    "GCC",
+    "MIR",
+    "NaNs",
+    "OK",
+    "Rust",
+    "Unicode",
+    "VS",
+    // tidy-alphabetical-end
+];
+
+/// See: https://rustc-dev-guide.rust-lang.org/diagnostics.html#diagnostic-output-style-guide
+fn verify_message_style(msg_span: Span, message: &str) {
+    // Verify that message starts with lowercase char
+    let Some(first_word) = message.split_whitespace().next() else {
+        span_err(msg_span.unwrap(), "message must not be empty").emit();
+        return;
+    };
+    let first_char = first_word.chars().next().expect("Word is not empty");
+    if first_char.is_uppercase() && !ALLOWED_CAPITALIZED_WORDS.contains(&first_word) {
+        span_err(msg_span.unwrap(), "message `{value}` starts with an uppercase letter. Fix it or add it to `ALLOWED_CAPITALIZED_WORDS`").emit();
+        return;
+    }
+
+    // Verify that message does not end in `.`
+    if message.ends_with(".") && !message.ends_with("...") {
+        span_err(msg_span.unwrap(), "message `{value}` ends with a period").emit();
+        return;
+    }
+}