@@ -6,6 +6,7 @@ use rustc_index::IndexVec;
6
6
use rustc_middle:: ty:: layout:: {
7
7
FnAbiError , FnAbiOfHelpers , FnAbiRequest , LayoutError , LayoutOfHelpers ,
8
8
} ;
9
+ use rustc_span:: source_map:: Spanned ;
9
10
use rustc_span:: SourceFile ;
10
11
use rustc_target:: abi:: call:: FnAbi ;
11
12
use rustc_target:: abi:: { Integer , Primitive } ;
@@ -495,25 +496,16 @@ impl<'tcx> FnAbiOfHelpers<'tcx> for RevealAllLayoutCx<'tcx> {
495
496
fn_abi_request : FnAbiRequest < ' tcx > ,
496
497
) -> ! {
497
498
if let FnAbiError :: Layout ( LayoutError :: SizeOverflow ( _) ) = err {
498
- self . 0 . sess . span_fatal ( span, err. to_string ( ) )
499
+ self . 0 . sess . emit_fatal ( Spanned { span, node : err } )
499
500
} else {
500
501
match fn_abi_request {
501
502
FnAbiRequest :: OfFnPtr { sig, extra_args } => {
502
- span_bug ! (
503
- span,
504
- "`fn_abi_of_fn_ptr({}, {:?})` failed: {}" ,
505
- sig,
506
- extra_args,
507
- err
508
- ) ;
503
+ span_bug ! ( span, "`fn_abi_of_fn_ptr({sig}, {extra_args:?})` failed: {err:?}" ) ;
509
504
}
510
505
FnAbiRequest :: OfInstance { instance, extra_args } => {
511
506
span_bug ! (
512
507
span,
513
- "`fn_abi_of_instance({}, {:?})` failed: {}" ,
514
- instance,
515
- extra_args,
516
- err
508
+ "`fn_abi_of_instance({instance}, {extra_args:?})` failed: {err:?}"
517
509
) ;
518
510
}
519
511
}
0 commit comments