Skip to content

Commit f16ca93

Browse files
committed
Use translatable diagnostics in rustc_const_eval
1 parent 3d0a0dc commit f16ca93

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

src/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn set_global_alignment<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, gv: LValue<'gcc>
2424
match Align::from_bits(min) {
2525
Ok(min) => align = align.max(min),
2626
Err(err) => {
27-
cx.sess().emit_err(InvalidMinimumAlignment { err });
27+
cx.sess().emit_err(InvalidMinimumAlignment { err: err.to_string() });
2828
}
2929
}
3030
}

src/context.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ impl<'gcc, 'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> {
477477
#[inline]
478478
fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! {
479479
if let LayoutError::SizeOverflow(_) = err {
480-
self.sess().emit_fatal(respan(span, err))
480+
self.sess().emit_fatal(respan(span, err.into_diagnostic()))
481481
} else {
482482
span_bug!(span, "failed to get layout for `{}`: {}", ty, err)
483483
}
@@ -499,21 +499,12 @@ impl<'gcc, 'tcx> FnAbiOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> {
499499
} else {
500500
match fn_abi_request {
501501
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-
);
502+
span_bug!(span, "`fn_abi_of_fn_ptr({sig}, {extra_args:?})` failed: {err:?}");
509503
}
510504
FnAbiRequest::OfInstance { instance, extra_args } => {
511505
span_bug!(
512506
span,
513-
"`fn_abi_of_instance({}, {:?})` failed: {}",
514-
instance,
515-
extra_args,
516-
err
507+
"`fn_abi_of_instance({instance}, {extra_args:?})` failed: {err:?}"
517508
);
518509
}
519510
}

0 commit comments

Comments
 (0)