Skip to content

Commit

Permalink
Auto merge of #121489 - nnethercote:diag-renaming, r=davidtwco
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
bors committed Feb 28, 2024
2 parents 51bf6b8 + c541cc3 commit 53ff07e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/diagnostics.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::fmt::{self, Write};
use std::num::NonZero;

use rustc_errors::{DiagnosticBuilder, DiagnosticMessage, Level};
use rustc_errors::{Diag, DiagnosticMessage, Level};
use rustc_span::{SpanData, Symbol, DUMMY_SP};
use rustc_target::abi::{Align, Size};

Expand Down Expand Up @@ -100,7 +100,7 @@ impl MachineStopType for TerminationInfo {
}
fn add_args(
self: Box<Self>,
_: &mut dyn FnMut(std::borrow::Cow<'static, str>, rustc_errors::DiagnosticArgValue),
_: &mut dyn FnMut(std::borrow::Cow<'static, str>, rustc_errors::DiagArgValue),
) {
}
}
Expand Down Expand Up @@ -459,7 +459,7 @@ pub fn report_msg<'tcx>(
DiagLevel::Warning => Level::Warning,
DiagLevel::Note => Level::Note,
};
let mut err = DiagnosticBuilder::<()>::new(sess.dcx(), level, title);
let mut err = Diag::<()>::new(sess.dcx(), level, title);
err.span(span);

// Show main message.
Expand Down

0 comments on commit 53ff07e

Please sign in to comment.