bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename Handler::span_note_diag as struct_span_note.

Browse source 
Because `span_note_diag` doesn't follow the naming structure used for
the error reporting functions.
This commit is contained in:
Nicholas Nethercote 2023-11-30 14:04:52 +11:00
parent 95be8b2189
commit 7138845f61
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_borrowck/src/nll.rs
View file

@ -407,7 +407,7 @@ pub(super) fn dump_annotation<'tcx>(
let def_span = tcx.def_span(body.source.def_id()); let def_span = tcx.def_span(body.source.def_id());
let mut err = if let Some(closure_region_requirements) = closure_region_requirements { let mut err = if let Some(closure_region_requirements) = closure_region_requirements {
let mut err = tcx.sess.diagnostic().span_note_diag(def_span, "external requirements"); let mut err = tcx.sess.diagnostic().struct_span_note(def_span, "external requirements");
regioncx.annotate(tcx, &mut err); regioncx.annotate(tcx, &mut err);
@ -426,7 +426,7 @@ pub(super) fn dump_annotation<'tcx>(
err err
} else { } else {
let mut err = tcx.sess.diagnostic().span_note_diag(def_span, "no external requirements"); let mut err = tcx.sess.diagnostic().struct_span_note(def_span, "no external requirements");
regioncx.annotate(tcx, &mut err); regioncx.annotate(tcx, &mut err);
err err

2
compiler/rustc_errors/src/lib.rs
View file

@ -1032,7 +1032,7 @@ impl Handler {
#[track_caller] #[track_caller]
#[rustc_lint_diagnostics] #[rustc_lint_diagnostics]
pub fn span_note_diag( pub fn struct_span_note(
&self, &self,
span: Span, span: Span,
msg: impl Into<DiagnosticMessage>, msg: impl Into<DiagnosticMessage>,

2
src/tools/miri/src/diagnostics.rs
View file

@ -456,7 +456,7 @@ pub fn report_msg<'tcx>(
let mut err = match diag_level { let mut err = match diag_level {
DiagLevel::Error => sess.struct_span_err(span, title).forget_guarantee(), DiagLevel::Error => sess.struct_span_err(span, title).forget_guarantee(),
DiagLevel::Warning => sess.struct_span_warn(span, title), DiagLevel::Warning => sess.struct_span_warn(span, title),
DiagLevel::Note => sess.diagnostic().span_note_diag(span, title), DiagLevel::Note => sess.diagnostic().struct_span_note(span, title),
}; };
// Show main message. // Show main message.