dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use translatable diagnostics in `rustc_const_eval`

This commit is contained in:
Deadbeef 2023-05-17 10:30:14 +00:00
parent 04dca8f1b2
commit fcd93accb4
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common.rs
View File

@ -6,6 +6,7 @@ use rustc_index::IndexVec;
use rustc_middle::ty::layout::{ use rustc_middle::ty::layout::{
FnAbiError, FnAbiOfHelpers, FnAbiRequest, LayoutError, LayoutOfHelpers, FnAbiError, FnAbiOfHelpers, FnAbiRequest, LayoutError, LayoutOfHelpers,
}; };
use rustc_span::source_map::Spanned;
use rustc_span::SourceFile; use rustc_span::SourceFile;
use rustc_target::abi::call::FnAbi; use rustc_target::abi::call::FnAbi;
use rustc_target::abi::{Integer, Primitive}; use rustc_target::abi::{Integer, Primitive};
@ -495,25 +496,16 @@ impl<'tcx> FnAbiOfHelpers<'tcx> for RevealAllLayoutCx<'tcx> {
fn_abi_request: FnAbiRequest<'tcx>, fn_abi_request: FnAbiRequest<'tcx>,
) -> ! { ) -> ! {
if let FnAbiError::Layout(LayoutError::SizeOverflow(_)) = err { 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 { } else {
match fn_abi_request { match fn_abi_request {
FnAbiRequest::OfFnPtr { sig, extra_args } => { FnAbiRequest::OfFnPtr { sig, extra_args } => {
span_bug!( span_bug!(span, "`fn_abi_of_fn_ptr({sig}, {extra_args:?})` failed: {err:?}");
span,
"`fn_abi_of_fn_ptr({}, {:?})` failed: {}",
sig,
extra_args,
err
);
} }
FnAbiRequest::OfInstance { instance, extra_args } => { FnAbiRequest::OfInstance { instance, extra_args } => {
span_bug!( span_bug!(
span, span,
"`fn_abi_of_instance({}, {:?})` failed: {}", "`fn_abi_of_instance({instance}, {extra_args:?})` failed: {err:?}"
instance,
extra_args,
err
); );
} }
} }