Inline fluent messages

Author: nbdd0121

flake.lock

@@ -7,18 +7,20 @@ use crate::ctxt::AnalysisCtxt;
 use crate::diagnostic::use_stack::{UseSite, UseSiteKind};
 
 #[derive(Diagnostic)]
-#[diag(klint_build_error_referenced_without_symbol)]
+#[diag("found a reference to `build_error` in the object file, but no associated symbol is found")]
 struct BuildErrorReferencedWithoutSymbol;
 
 #[derive(Diagnostic)]
-#[diag(klint_build_error_referenced_without_instance)]
+#[diag(
+    "symbol `{$symbol}` references `build_error` in the object file, but no associated instance is found"
+)]
 struct BuildErrorReferencedWithoutInstance<'a> {
     pub symbol: &'a str,
 }
 
 #[derive(Diagnostic)]
-#[diag(klint_build_error_referenced_without_debug)]
-#[note]
+#[diag("`{$kind} {$instance}` contains reference to `build_error`")]
+#[note("attempt to reconstruct line information from DWARF failed: {$err}")]
 struct BuildErrorReferencedWithoutDebug<'tcx> {
     #[primary_span]
     pub span: Span,
@@ -28,7 +30,7 @@ struct BuildErrorReferencedWithoutDebug<'tcx> {
 }
 
 #[derive(Diagnostic)]
-#[diag(klint_build_error_referenced)]
+#[diag("this `build_error` reference is not optimized away")]
 struct BuildErrorReferenced;
 
 pub fn build_error_detection<'tcx, 'obj>(cx: &AnalysisCtxt<'tcx>, file: &File<'obj>) {

src/binary_analysis/build_error.rs

@@ -19,26 +19,26 @@ declare_tool_lint! {
 }
 
 #[derive(Diagnostic)]
-#[diag(klint_stack_frame_limit_missing)]
-#[help(klint_stack_frame_limit_help)]
+#[diag("stack size limit is not set, default to {$default} bytes")]
+#[help("set stack size limit with `--cfg CONFIG_FRAME_WARN=\"<size-in-bytes>\"`")]
 struct StackFrameLimitMissing {
     #[primary_span]
     pub span: Span,
     pub default: u32,
 }
 
 #[derive(Diagnostic)]
-#[diag(klint_stack_frame_limit_invalid)]
-#[help(klint_stack_frame_limit_help)]
+#[diag("stack size limit is set to `{$setting}` bytes, which cannot be parsed as integer")]
+#[help("set stack size limit with `--cfg CONFIG_FRAME_WARN=\"<size-in-bytes>\"`")]
 struct StackFrameLimitInvalid {
     #[primary_span]
     pub span: Span,
     pub setting: Symbol,
 }
 
 #[derive(Diagnostic)]
-#[diag(klint_stack_frame_too_large)]
-#[note]
+#[diag("stack size of `{$instance}` is {$stack_size} bytes, exceeds the {$frame_limit}-byte limit")]
+#[note("the stack size is inferred from instruction `{$insn}` at {$section}+{$offset}")]
 struct StackFrameTooLarge<'a, 'tcx> {
     pub section: &'a str,
     pub offset: u64,

src/binary_analysis/stack_size.rs

@@ -14,13 +14,13 @@ use crate::ctxt::{AnalysisCtxt, QueryValueDecodable};
 use crate::{attribute::KlintAttribute, ctxt::PersistentQuery};
 
 #[derive(Diagnostic)]
-#[diag(klint_duplicate_diagnostic_item_in_crate)]
+#[diag("duplicate klint diagnostic item in crate `{$crate_name}`: `{$name}`")]
 struct DuplicateDiagnosticItemInCrate {
     #[primary_span]
     pub duplicate_span: Option<Span>,
-    #[note(klint_diagnostic_item_first_defined)]
+    #[note("the klint diagnostic item is first defined here")]
     pub orig_span: Option<Span>,
-    #[note]
+    #[note("the diagnostic item is first defined in crate `{$orig_crate_name}`")]
     pub different_crates: bool,
     pub crate_name: Symbol,
     pub orig_crate_name: Symbol,

src/diagnostic_items/mod.rs

@@ -29,7 +29,6 @@ extern crate rustc_codegen_ssa;
 extern crate rustc_data_structures;
 extern crate rustc_driver;
 extern crate rustc_errors;
-extern crate rustc_fluent_macro;
 extern crate rustc_hir;
 extern crate rustc_index;
 extern crate rustc_infer;
@@ -96,7 +95,6 @@ impl Callbacks for MyCallbacks {
             _ => (),
         }
 
-        config.locale_resources.push(crate::DEFAULT_LOCALE_RESOURCE);
         config.extra_symbols = crate::symbol::EXTRA_SYMBOLS.to_owned();
 
         config.override_queries = Some(|_, provider| {
@@ -176,5 +174,3 @@ fn main() {
 
     driver::run_compiler(&args, MyCallbacks);
 }
-
-rustc_fluent_macro::fluent_messages! { "./messages.ftl" }

src/main.rs

@@ -39,7 +39,7 @@ use std::cell::OnceCell;
 
 // From rustc_monomorphize/errors.rs
 #[derive(Diagnostic)]
-#[diag(klint_monomorphize_encountered_error_while_instantiating)]
+#[diag("the above error was encountered while instantiating `{$kind} {$instance}`")]
 struct EncounteredErrorWhileInstantiating<'tcx> {
     #[primary_span]
     pub span: Span,
@@ -48,19 +48,19 @@ struct EncounteredErrorWhileInstantiating<'tcx> {
 }
 
 #[derive(Diagnostic)]
-#[diag(klint_monomorphize_encountered_error_while_instantiating_global_asm)]
+#[diag("the above error was encountered while instantiating `global_asm`")]
 struct EncounteredErrorWhileInstantiatingGlobalAsm {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
-#[diag(klint_monomorphize_recursion_limit)]
+#[diag("reached the recursion limit while instantiating `{$instance}`")]
 struct RecursionLimit<'tcx> {
     #[primary_span]
     pub span: Span,
     pub instance: Instance<'tcx>,
-    #[note]
+    #[note("`{$def_path_str}` defined here")]
     pub def_span: Span,
     pub def_path_str: String,
 }