From 7294fcdc410051777f124a80d63e7a7a629fcec5 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 23 Aug 2018 16:36:51 +0200 Subject: [PATCH] improve panic message --- src/librustc_codegen_llvm/mir/block.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/librustc_codegen_llvm/mir/block.rs b/src/librustc_codegen_llvm/mir/block.rs index 72fb9df6f81b..c8515a4b6fff 100644 --- a/src/librustc_codegen_llvm/mir/block.rs +++ b/src/librustc_codegen_llvm/mir/block.rs @@ -475,14 +475,12 @@ impl FunctionCx<'a, 'll, 'tcx> { .max(tcx.data_layout.i32_align) .max(tcx.data_layout.pointer_align); - let str = if intrinsic == Some("init") { - "Attempted to instantiate an uninhabited type (e.g. `!`) \ - using mem::zeroed()" - } else { - "Attempted to instantiate an uninhabited type (e.g. `!`) \ - using mem::uninitialized()" - }; - let msg_str = Symbol::intern(str).as_str(); + let str = format!( + "Attempted to instantiate uninhabited type {} using mem::{}", + sig.output(), + if intrinsic == Some("init") { "zeroed" } else { "uninitialized" } + ); + let msg_str = Symbol::intern(&str).as_str(); let msg_str = C_str_slice(bx.cx, msg_str); let msg_file_line_col = C_struct(bx.cx, &[msg_str, filename, line, col],