@@ -3,7 +3,7 @@ use std::num::NonZeroU64;
3
3
4
4
use log:: trace;
5
5
6
- use rustc_errors:: DiagnosticMessage ;
6
+ use rustc_errors:: { DiagnosticBuilder , DiagnosticMessage , Level } ;
7
7
use rustc_span:: { SpanData , Symbol , DUMMY_SP } ;
8
8
use rustc_target:: abi:: { Align , Size } ;
9
9
@@ -453,11 +453,13 @@ pub fn report_msg<'tcx>(
453
453
) {
454
454
let span = stacktrace. first ( ) . map_or ( DUMMY_SP , |fi| fi. span ) ;
455
455
let sess = machine. tcx . sess ;
456
- let mut err = match diag_level {
457
- DiagLevel :: Error => sess . struct_span_err ( span , title ) . forget_guarantee ( ) ,
458
- DiagLevel :: Warning => sess . struct_span_warn ( span , title ) ,
459
- DiagLevel :: Note => sess . dcx ( ) . struct_span_note ( span , title ) ,
456
+ let level = match diag_level {
457
+ DiagLevel :: Error => Level :: Error { lint : false } ,
458
+ DiagLevel :: Warning => Level :: Warning ( None ) ,
459
+ DiagLevel :: Note => Level :: Note ,
460
460
} ;
461
+ let mut err = DiagnosticBuilder :: < ( ) > :: new ( sess. dcx ( ) , level, title) ;
462
+ err. set_span ( span) ;
461
463
462
464
// Show main message.
463
465
if span != DUMMY_SP {
0 commit comments