Auto merge of #121780 - nnethercote:diag-renaming2, r=davidtwco

bors · bors · commit 0506ff52508f · 2024-03-05T02:58:34.000Z
Diagnostic renaming 2

A sequel to #121489.

r? `@davidtwco`
diff --git a/src/diagnostics.rs b/src/diagnostics.rs
@@ -1,7 +1,7 @@
 use std::fmt::{self, Write};
 use std::num::NonZero;
 
-use rustc_errors::{Diag, DiagnosticMessage, Level};
+use rustc_errors::{Diag, DiagMessage, Level};
 use rustc_span::{SpanData, Symbol, DUMMY_SP};
 use rustc_target::abi::{Align, Size};
 
@@ -95,7 +95,7 @@ impl fmt::Debug for TerminationInfo {
 }
 
 impl MachineStopType for TerminationInfo {
-    fn diagnostic_message(&self) -> DiagnosticMessage {
+    fn diagnostic_message(&self) -> DiagMessage {
         self.to_string().into()
     }
     fn add_args(

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`use std::fmt::{self, Write};`
`2`	`2`	`use std::num::NonZero;`
`3`	`3`
`4`		`-use rustc_errors::{Diag, DiagnosticMessage, Level};`
	`4`	`+use rustc_errors::{Diag, DiagMessage, Level};`
`5`	`5`	`use rustc_span::{SpanData, Symbol, DUMMY_SP};`
`6`	`6`	`use rustc_target::abi::{Align, Size};`
`7`	`7`
`@@ -95,7 +95,7 @@ impl fmt::Debug for TerminationInfo {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`impl MachineStopType for TerminationInfo {`
`98`		`- fn diagnostic_message(&self) -> DiagnosticMessage {`
	`98`	`+ fn diagnostic_message(&self) -> DiagMessage {`
`99`	`99`	`self.to_string().into()`
`100`	`100`	`}`
`101`	`101`	`fn add_args(`