Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pass DiagArgMap instead of FluentArgs into format_diag_message

Browse Source
This commit is contained in:
Jonathan Brouwer
2026-02-28 19:50:01 +01:00
parent 5ade46246e
commit 51f35d76a2
6 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
+7 -9
View File
@@ -16,7 +16,7 @@
use anstream::ColorChoice;
use derive_setters::Setters;
use rustc_data_structures::sync::IntoDynSyncSend;
use rustc_error_messages::{FluentArgs, SpanLabel};
use rustc_error_messages::{DiagArgMap, SpanLabel};
use rustc_lint_defs::pluralize;
use rustc_span::source_map::SourceMap;
use rustc_span::{BytePos, FileName, Pos, SourceFile, Span};
@@ -26,7 +26,7 @@
ConfusionType, Destination, MAX_SUGGESTIONS, OutputTheme, detect_confusion_type, is_different,
normalize_whitespace, should_show_source_code,
};
use crate::translation::{format_diag_message, format_diag_messages, to_fluent_args};
use crate::translation::{format_diag_message, format_diag_messages};
use crate::{
CodeSuggestion, DiagInner, DiagMessage, Emitter, ErrCode, Level, MultiSpan, Style, Subdiag,
SuggestionStyle, TerminalUrl,
@@ -70,14 +70,12 @@ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
impl Emitter for AnnotateSnippetEmitter {
/// The entry point for the diagnostics generation
fn emit_diagnostic(&mut self, mut diag: DiagInner) {
let fluent_args = to_fluent_args(diag.args.iter());
if self.track_diagnostics && diag.span.has_primary_spans() && !diag.span.is_dummy() {
diag.children.insert(0, diag.emitted_at_sub_diag());
}
let mut suggestions = diag.suggestions.unwrap_tag();
self.primary_span_formatted(&mut diag.span, &mut suggestions, &fluent_args);
self.primary_span_formatted(&mut diag.span, &mut suggestions, &diag.args);
self.fix_multispans_in_extern_macros_and_render_macro_backtrace(
&mut diag.span,
@@ -89,7 +87,7 @@ fn emit_diagnostic(&mut self, mut diag: DiagInner) {
self.emit_messages_default(
&diag.level,
&diag.messages,
&fluent_args,
&diag.args,
&diag.code,
&diag.span,
&diag.children,
@@ -145,7 +143,7 @@ fn emit_messages_default(
&mut self,
level: &Level,
msgs: &[(DiagMessage, Style)],
args: &FluentArgs<'_>,
args: &DiagArgMap,
code: &Option<ErrCode>,
msp: &MultiSpan,
children: &[Subdiag],
@@ -539,7 +537,7 @@ fn pre_style_msgs(
&self,
msgs: &[(DiagMessage, Style)],
level: Level,
args: &FluentArgs<'_>,
args: &DiagArgMap,
) -> String {
msgs.iter()
.filter_map(|(m, style)| {
@@ -673,7 +671,7 @@ struct Annotation {
}
fn collect_annotations(
args: &FluentArgs<'_>,
args: &DiagArgMap,
msp: &MultiSpan,
sm: &Arc<SourceMap>,
) -> Vec<(Arc<SourceFile>, Vec<Annotation>)> {
compiler/rustc_errors/src/emitter.rs
+2 -2
View File
@@ -17,7 +17,7 @@
use anstyle::{AnsiColor, Effects};
use rustc_data_structures::fx::FxIndexSet;
use rustc_data_structures::sync::DynSend;
use rustc_error_messages::FluentArgs;
use rustc_error_messages::DiagArgMap;
use rustc_span::hygiene::{ExpnKind, MacroKind};
use rustc_span::source_map::SourceMap;
use rustc_span::{FileName, SourceFile, Span};
@@ -102,7 +102,7 @@ fn primary_span_formatted(
&self,
primary_span: &mut MultiSpan,
suggestions: &mut Vec<CodeSuggestion>,
fluent_args: &FluentArgs<'_>,
fluent_args: &DiagArgMap,
) {
if let Some((sugg, rest)) = suggestions.split_first() {
let msg = format_diag_message(&sugg.msg, fluent_args);
compiler/rustc_errors/src/json.rs
+15 -22
View File
@@ -17,7 +17,7 @@
use anstream::{AutoStream, ColorChoice};
use derive_setters::Setters;
use rustc_data_structures::sync::IntoDynSyncSend;
use rustc_error_messages::FluentArgs;
use rustc_error_messages::DiagArgMap;
use rustc_lint_defs::Applicability;
use rustc_span::hygiene::ExpnData;
use rustc_span::source_map::{FilePathMapping, SourceMap};
@@ -31,7 +31,7 @@
should_show_source_code,
};
use crate::timings::{TimingRecord, TimingSection};
use crate::translation::{format_diag_message, format_diag_messages, to_fluent_args};
use crate::translation::{format_diag_message, format_diag_messages};
use crate::{CodeSuggestion, MultiSpan, SpanLabel, Subdiag, Suggestions, TerminalUrl};
#[cfg(test)]
@@ -298,14 +298,13 @@ struct UnusedExterns<'a> {
impl Diagnostic {
/// Converts from `rustc_errors::DiagInner` to `Diagnostic`.
fn from_errors_diagnostic(diag: crate::DiagInner, je: &JsonEmitter) -> Diagnostic {
let args = to_fluent_args(diag.args.iter());
let sugg_to_diag = |sugg: &CodeSuggestion| {
let translated_message = format_diag_message(&sugg.msg, &args);
let translated_message = format_diag_message(&sugg.msg, &diag.args);
Diagnostic {
message: translated_message.to_string(),
code: None,
level: "help",
spans: DiagnosticSpan::from_suggestion(sugg, &args, je),
spans: DiagnosticSpan::from_suggestion(sugg, &diag.args, je),
children: vec![],
rendered: None,
}
@@ -331,7 +330,7 @@ fn flush(&mut self) -> io::Result<()> {
}
}
let translated_message = format_diag_messages(&diag.messages, &args);
let translated_message = format_diag_messages(&diag.messages, &diag.args);
let code = if let Some(code) = diag.code {
Some(DiagnosticCode {
@@ -344,16 +343,18 @@ fn flush(&mut self) -> io::Result<()> {
None
};
let level = diag.level.to_str();
let spans = DiagnosticSpan::from_multispan(&diag.span, &args, je);
let spans = DiagnosticSpan::from_multispan(&diag.span, &diag.args, je);
let mut children: Vec<Diagnostic> = diag
.children
.iter()
.map(|c| Diagnostic::from_sub_diagnostic(c, &args, je))
.map(|c| Diagnostic::from_sub_diagnostic(c, &diag.args, je))
.chain(sugg)
.collect();
if je.track_diagnostics && diag.span.has_primary_spans() && !diag.span.is_dummy() {
children
.insert(0, Diagnostic::from_sub_diagnostic(&diag.emitted_at_sub_diag(), &args, je));
children.insert(
0,
Diagnostic::from_sub_diagnostic(&diag.emitted_at_sub_diag(), &diag.args, je),
);
}
let buf = BufWriter(Arc::new(Mutex::new(Vec::new())));
let dst: Destination = AutoStream::new(
@@ -388,11 +389,7 @@ fn flush(&mut self) -> io::Result<()> {
}
}
fn from_sub_diagnostic(
subdiag: &Subdiag,
args: &FluentArgs<'_>,
je: &JsonEmitter,
) -> Diagnostic {
fn from_sub_diagnostic(subdiag: &Subdiag, args: &DiagArgMap, je: &JsonEmitter) -> Diagnostic {
let translated_message = format_diag_messages(&subdiag.messages, args);
Diagnostic {
message: translated_message.to_string(),
@@ -409,7 +406,7 @@ impl DiagnosticSpan {
fn from_span_label(
span: SpanLabel,
suggestion: Option<(&String, Applicability)>,
args: &FluentArgs<'_>,
args: &DiagArgMap,
je: &JsonEmitter,
) -> DiagnosticSpan {
Self::from_span_etc(
@@ -509,11 +506,7 @@ fn from_span_full(
}
}
fn from_multispan(
msp: &MultiSpan,
args: &FluentArgs<'_>,
je: &JsonEmitter,
) -> Vec<DiagnosticSpan> {
fn from_multispan(msp: &MultiSpan, args: &DiagArgMap, je: &JsonEmitter) -> Vec<DiagnosticSpan> {
msp.span_labels()
.into_iter()
.map(|span_str| Self::from_span_label(span_str, None, args, je))
@@ -522,7 +515,7 @@ fn from_multispan(
fn from_suggestion(
suggestion: &CodeSuggestion,
args: &FluentArgs<'_>,
args: &DiagArgMap,
je: &JsonEmitter,
) -> Vec<DiagnosticSpan> {
suggestion
compiler/rustc_errors/src/lib.rs
+1 -1
View File
@@ -1434,7 +1434,7 @@ fn eagerly_translate_to_string<'a>(
message: DiagMessage,
args: impl Iterator<Item = DiagArg<'a>>,
) -> String {
let args = crate::translation::to_fluent_args(args);
let args = args.map(|(name, val)| (name.clone(), val.clone())).collect();
format_diag_message(&message, &args).to_string()
}
compiler/rustc_errors/src/translation.rs
+7 -5
View File
@@ -1,7 +1,7 @@
use std::borrow::Cow;
pub use rustc_error_messages::FluentArgs;
use rustc_error_messages::{langid, register_functions};
use rustc_error_messages::{DiagArgMap, langid, register_functions};
use tracing::{debug, trace};
use crate::fluent_bundle::FluentResource;
@@ -12,7 +12,7 @@
///
/// Typically performed once for each diagnostic at the start of `emit_diagnostic` and then
/// passed around as a reference thereafter.
pub fn to_fluent_args<'iter>(iter: impl Iterator<Item = DiagArg<'iter>>) -> FluentArgs<'static> {
fn to_fluent_args<'iter>(iter: impl Iterator<Item = DiagArg<'iter>>) -> FluentArgs<'static> {
let mut args = if let Some(size) = iter.size_hint().1 {
FluentArgs::with_capacity(size)
} else {
@@ -29,14 +29,15 @@ pub fn to_fluent_args<'iter>(iter: impl Iterator<Item = DiagArg<'iter>>) -> Flue
/// Convert `DiagMessage`s to a string
pub fn format_diag_messages(
messages: &[(DiagMessage, Style)],
args: &FluentArgs<'_>,
args: &DiagArgMap,
) -> Cow<'static, str> {
Cow::Owned(messages.iter().map(|(m, _)| format_diag_message(m, args)).collect::<String>())
}
/// Convert a `DiagMessage` to a string
pub fn format_diag_message<'a>(message: &'a DiagMessage, args: &'a FluentArgs<'_>) -> Cow<'a, str> {
pub fn format_diag_message<'a>(message: &'a DiagMessage, args: &DiagArgMap) -> Cow<'a, str> {
trace!(?message, ?args);
match message {
DiagMessage::Str(msg) => Cow::Borrowed(msg),
// This translates an inline fluent diagnostic message
@@ -52,9 +53,10 @@ pub fn format_diag_message<'a>(message: &'a DiagMessage, args: &'a FluentArgs<'_
register_functions(&mut bundle);
let message = bundle.get_message(GENERATED_MSG_ID).unwrap();
let value = message.value().unwrap();
let args = to_fluent_args(args.iter());
let mut errs = vec![];
let translated = bundle.format_pattern(value, Some(args), &mut errs).to_string();
let translated = bundle.format_pattern(value, Some(&args), &mut errs).to_string();
debug!(?translated, ?errs);
if errs.is_empty() {
Cow::Owned(translated)