diff options
| author | Deadbeef <ent3rm4n@gmail.com> | 2023-05-17 10:30:14 +0000 |
|---|---|---|
| committer | Deadbeef <ent3rm4n@gmail.com> | 2023-06-01 14:45:18 +0000 |
| commit | fcd93accb49b21c908e2b86af9e5f9e5d90534bb (patch) | |
| tree | 8c2a74f00ae8a29b0ff0ce01b011cec096d77bc8 | |
| parent | 04dca8f1b2a93177af5a7210b5ec223a63a163f2 (diff) | |
| download | rust-fcd93accb49b21c908e2b86af9e5f9e5d90534bb.tar.gz rust-fcd93accb49b21c908e2b86af9e5f9e5d90534bb.zip | |
Use translatable diagnostics in `rustc_const_eval`
| -rw-r--r-- | src/common.rs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/common.rs b/src/common.rs index 67fd6d793e0..7243cf6da23 100644 --- a/src/common.rs +++ b/src/common.rs @@ -6,6 +6,7 @@ use rustc_index::IndexVec; use rustc_middle::ty::layout::{ FnAbiError, FnAbiOfHelpers, FnAbiRequest, LayoutError, LayoutOfHelpers, }; +use rustc_span::source_map::Spanned; use rustc_span::SourceFile; use rustc_target::abi::call::FnAbi; use rustc_target::abi::{Integer, Primitive}; @@ -495,25 +496,16 @@ impl<'tcx> FnAbiOfHelpers<'tcx> for RevealAllLayoutCx<'tcx> { fn_abi_request: FnAbiRequest<'tcx>, ) -> ! { if let FnAbiError::Layout(LayoutError::SizeOverflow(_)) = err { - self.0.sess.span_fatal(span, err.to_string()) + self.0.sess.emit_fatal(Spanned { span, node: err }) } else { match fn_abi_request { FnAbiRequest::OfFnPtr { sig, extra_args } => { - span_bug!( - span, - "`fn_abi_of_fn_ptr({}, {:?})` failed: {}", - sig, - extra_args, - err - ); + span_bug!(span, "`fn_abi_of_fn_ptr({sig}, {extra_args:?})` failed: {err:?}"); } FnAbiRequest::OfInstance { instance, extra_args } => { span_bug!( span, - "`fn_abi_of_instance({}, {:?})` failed: {}", - instance, - extra_args, - err + "`fn_abi_of_instance({instance}, {extra_args:?})` failed: {err:?}" ); } } |
