Skip to content

Commit 53ff07e

Browse files
committed
Auto merge of #121489 - nnethercote:diag-renaming, r=davidtwco
Diagnostic renaming Renaming various diagnostic types from `Diagnostic*` to `Diag*`. Part of rust-lang/compiler-team#722. There are more to do but this is enough for one PR. r? `@davidtwco`
2 parents 51bf6b8 + c541cc3 commit 53ff07e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/diagnostics.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::fmt::{self, Write};
22
use std::num::NonZero;
33

4-
use rustc_errors::{DiagnosticBuilder, DiagnosticMessage, Level};
4+
use rustc_errors::{Diag, DiagnosticMessage, Level};
55
use rustc_span::{SpanData, Symbol, DUMMY_SP};
66
use rustc_target::abi::{Align, Size};
77

@@ -100,7 +100,7 @@ impl MachineStopType for TerminationInfo {
100100
}
101101
fn add_args(
102102
self: Box<Self>,
103-
_: &mut dyn FnMut(std::borrow::Cow<'static, str>, rustc_errors::DiagnosticArgValue),
103+
_: &mut dyn FnMut(std::borrow::Cow<'static, str>, rustc_errors::DiagArgValue),
104104
) {
105105
}
106106
}
@@ -459,7 +459,7 @@ pub fn report_msg<'tcx>(
459459
DiagLevel::Warning => Level::Warning,
460460
DiagLevel::Note => Level::Note,
461461
};
462-
let mut err = DiagnosticBuilder::<()>::new(sess.dcx(), level, title);
462+
let mut err = Diag::<()>::new(sess.dcx(), level, title);
463463
err.span(span);
464464

465465
// Show main message.

0 commit comments

Comments
 (0)