user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing DiagnosticBuilder::eager_diagnostic method.

Browse source 
This lets us avoid the use of `DiagnosticBuilder::into_diagnostic` in
miri, when then means that `DiagnosticBuilder::into_diagnostic` can
become private, being now only used by `stash` and `buffer`.
This commit is contained in:
Nicholas Nethercote 2024-01-09 09:26:53 +11:00
parent ed76b0b882
commit 700a396520
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -499,14 +499,12 @@ pub fn report_msg<'tcx>(
err.note(if extra_span { "BACKTRACE (of the first span):" } else { "BACKTRACE:" });
}
let (mut err, handler) = err.into_diagnostic().unwrap();
// Add backtrace
for (idx, frame_info) in stacktrace.iter().enumerate() {
let is_local = machine.is_local(frame_info);
// No span for non-local frames and the first frame (which is the error site).
if is_local && idx > 0 {
err.eager_subdiagnostic(handler, frame_info.as_note(machine.tcx));
err.eager_subdiagnostic(err.dcx, frame_info.as_note(machine.tcx));
} else {
let sm = sess.source_map();
let span = sm.span_to_embeddable_string(frame_info.span);
@ -514,7 +512,7 @@ pub fn report_msg<'tcx>(
}
}
handler.emit_diagnostic(err);
err.emit();
}
impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {