Emit full spans in miri

oli-obk · oli-obk · commit 9188f8cb82c7 · 2022-12-06T18:59:47.000Z
diff --git a/src/tools/miri/src/diagnostics.rs b/src/tools/miri/src/diagnostics.rs
@@ -365,9 +365,8 @@ fn report_msg<'tcx>(
             err.span_note(frame_info.span, &frame_info.to_string());
         } else {
             let sm = sess.source_map();
-            let lo = sm.lookup_char_pos(frame_info.span.lo());
-            let filename = sm.filename_for_diagnostics(&lo.file.name);
-            err.note(format!("{frame_info} at {}:{}:{}", filename, lo.line, lo.col.0 + 1));
+            let span = sm.span_to_embeddable_string(frame_info.span);
+            err.note(format!("{frame_info} at {span}"));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -365,9 +365,8 @@ fn report_msg<'tcx>(`
`365`	`365`	`err.span_note(frame_info.span, &frame_info.to_string());`
`366`	`366`	`} else {`
`367`	`367`	`let sm = sess.source_map();`
`368`		`- let lo = sm.lookup_char_pos(frame_info.span.lo());`
`369`		`- let filename = sm.filename_for_diagnostics(&lo.file.name);`
`370`		`- err.note(format!("{frame_info} at {}:{}:{}", filename, lo.line, lo.col.0 + 1));`
	`368`	`+ let span = sm.span_to_embeddable_string(frame_info.span);`
	`369`	`+ err.note(format!("{frame_info} at {span}"));`
`371`	`370`	`}`
`372`	`371`	`}`
`373`	`372`