Remove eagerly_format from DiagCtxt

Author: JonathanBrouwer

compiler/rustc_errors/src/lib.rs

@@ -66,6 +66,7 @@ use rustc_span::{DUMMY_SP, Span};
 use tracing::debug;
 
 use crate::emitter::TimingEvent;
+use crate::formatting::DiagMessageAddArg;
 pub use crate::formatting::format_diag_message;
 use crate::timings::TimingRecord;
 
@@ -482,16 +483,6 @@ impl DiagCtxt {
         self.inner.borrow_mut().emitter = emitter;
     }
 
-    /// Format `message` eagerly with `args` to `DiagMessage::Eager`.
-    pub fn eagerly_format<'a>(
-        &self,
-        message: DiagMessage,
-        args: impl Iterator<Item = DiagArg<'a>>,
-    ) -> DiagMessage {
-        let inner = self.inner.borrow();
-        inner.eagerly_format(message, args)
-    }
-
     /// Format `message` eagerly with `args` to `String`.
     pub fn eagerly_format_to_string<'a>(
         &self,
@@ -1417,15 +1408,6 @@ impl DiagCtxtInner {
         self.has_errors().or_else(|| self.delayed_bugs.get(0).map(|(_, guar)| guar).copied())
     }
 
-    /// Format `message` eagerly with `args` to `DiagMessage::Eager`.
-    fn eagerly_format<'a>(
-        &self,
-        message: DiagMessage,
-        args: impl Iterator<Item = DiagArg<'a>>,
-    ) -> DiagMessage {
-        DiagMessage::Str(Cow::from(self.eagerly_format_to_string(message, args)))
-    }
-
     /// Format `message` eagerly with `args` to `String`.
     fn eagerly_format_to_string<'a>(
         &self,
@@ -1436,14 +1418,6 @@ impl DiagCtxtInner {
         format_diag_message(&message, &args).to_string()
     }
 
-    fn eagerly_format_for_subdiag(
-        &self,
-        diag: &DiagInner,
-        msg: impl Into<DiagMessage>,
-    ) -> DiagMessage {
-        self.eagerly_format(msg.into(), diag.args.iter())
-    }
-
     fn flush_delayed(&mut self) {
         // Stashed diagnostics must be emitted before delayed bugs are flushed.
         // Otherwise, we might ICE prematurely when errors would have
@@ -1493,7 +1467,7 @@ impl DiagCtxtInner {
                 );
             }
 
-            let mut bug = if decorate { bug.decorate(self) } else { bug.inner };
+            let mut bug = if decorate { bug.decorate() } else { bug.inner };
 
             // "Undelay" the delayed bugs into plain bugs.
             if bug.level != DelayedBug {
@@ -1503,11 +1477,9 @@ impl DiagCtxtInner {
                 // We are at the `DiagInner`/`DiagCtxtInner` level rather than
                 // the usual `Diag`/`DiagCtxt` level, so we must augment `bug`
                 // in a lower-level fashion.
-                bug.arg("level", bug.level);
                 let msg = msg!(
                     "`flushed_delayed` got diagnostic with level {$level}, instead of the expected `DelayedBug`"
-                );
-                let msg = self.eagerly_format_for_subdiag(&bug, msg); // after the `arg` call
+                ).arg("level", bug.level).format();
                 bug.sub(Note, msg, bug.span.primary_span().unwrap().into());
             }
             bug.level = Bug;
@@ -1542,7 +1514,7 @@ impl DelayedDiagInner {
         DelayedDiagInner { inner: diagnostic, note: backtrace }
     }
 
-    fn decorate(self, dcx: &DiagCtxtInner) -> DiagInner {
+    fn decorate(self) -> DiagInner {
         // We are at the `DiagInner`/`DiagCtxtInner` level rather than the
         // usual `Diag`/`DiagCtxt` level, so we must construct `diag` in a
         // lower-level fashion.
@@ -1555,10 +1527,10 @@ impl DelayedDiagInner {
             // Avoid the needless newline when no backtrace has been captured,
             // the display impl should just be a single line.
             _ => msg!("delayed at {$emitted_at} - {$note}"),
-        };
-        diag.arg("emitted_at", diag.emitted_at.clone());
-        diag.arg("note", self.note);
-        let msg = dcx.eagerly_format_for_subdiag(&diag, msg); // after the `arg` calls
+        }
+        .arg("emitted_at", diag.emitted_at.clone())
+        .arg("note", self.note)
+        .format();
         diag.sub(Note, msg, diag.span.primary_span().unwrap_or(DUMMY_SP).into());
         diag
     }

compiler/rustc_hir_typeck/src/errors.rs

@@ -989,11 +989,15 @@ impl rustc_errors::Subdiagnostic for CastUnknownPointerSub {
             CastUnknownPointerSub::To(span) => {
                 let msg = msg!("needs more type information");
                 diag.span_label(span, msg);
-                let msg = msg!("the type information given here is insufficient to check whether the pointer cast is valid");
+                let msg = msg!(
+                    "the type information given here is insufficient to check whether the pointer cast is valid"
+                );
                 diag.note(msg);
             }
             CastUnknownPointerSub::From(span) => {
-                let msg = msg!("the type information given here is insufficient to check whether the pointer cast is valid");
+                let msg = msg!(
+                    "the type information given here is insufficient to check whether the pointer cast is valid"
+                );
                 diag.span_label(span, msg);
             }
         }

compiler/rustc_lint/src/if_let_rescope.rs

@@ -354,9 +354,8 @@ impl Subdiagnostic for IfLetRescopeRewrite {
                 .chain(repeat_n('}', closing_brackets.count))
                 .collect(),
         ));
-        let msg = msg!(
-            "a `match` with a single arm can preserve the drop order up to Edition 2021"
-        );
+        let msg =
+            msg!("a `match` with a single arm can preserve the drop order up to Edition 2021");
         diag.multipart_suggestion_with_style(
             msg,
             suggestions,

compiler/rustc_trait_selection/src/errors.rs

@@ -1169,7 +1169,9 @@ impl Subdiagnostic for ConsiderBorrowingParamHelp {
             type_param_span
                 .push_span_label(span, msg!("consider borrowing this type parameter in the trait"));
         }
-        let msg = msg!("the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`");
+        let msg = msg!(
+            "the lifetime requirements from the `impl` do not correspond to the requirements in the `trait`"
+        );
         diag.span_help(type_param_span, msg);
     }
 }