1
Fork 0

Inline and remove DescriptionCtx::add_to.

It has a single callsite.
This commit is contained in:
Nicholas Nethercote 2023-04-11 17:29:51 +10:00
parent 955ba37aa5
commit c9b0635679

View file

@ -108,11 +108,6 @@ impl<'a> DescriptionCtx<'a> {
} }
Some(me) Some(me)
} }
fn add_to(self, diag: &mut rustc_errors::Diagnostic) {
diag.set_arg("desc_kind", self.kind);
diag.set_arg("desc_arg", self.arg);
}
} }
pub enum PrefixKind { pub enum PrefixKind {
@ -196,10 +191,11 @@ impl AddToDiagnostic for RegionExplanation<'_> {
{ {
diag.set_arg("pref_kind", self.prefix); diag.set_arg("pref_kind", self.prefix);
diag.set_arg("suff_kind", self.suffix); diag.set_arg("suff_kind", self.suffix);
let desc_span = self.desc.span; diag.set_arg("desc_kind", self.desc.kind);
self.desc.add_to(diag); diag.set_arg("desc_arg", self.desc.arg);
let msg = f(diag, fluent::infer_region_explanation.into()); let msg = f(diag, fluent::infer_region_explanation.into());
if let Some(span) = desc_span { if let Some(span) = self.desc.span {
diag.span_note(span, msg); diag.span_note(span, msg);
} else { } else {
diag.note(msg); diag.note(msg);