change expect() to unwrap_or_else() and update msg

2023-04-30 09:47:29 -04:00
parent 9aa596a014
commit cb74cd524f
2 changed files with 7 additions and 3 deletions
--- a/compiler/rustc_codegen_llvm/src/llvm_util.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs
@@ -331,7 +331,7 @@ pub(crate) fn print(req: PrintRequest, sess: &Session) {
    match req {
        PrintRequest::TargetCPUs => {
            let cpu_cstring = CString::new(handle_native(sess.target.cpu.as_ref()))
-                .expect("failed to convert to cstring");
+                .unwrap_or_else(|e| bug!("failed to convert to cstring: {}", e));
            unsafe { llvm::LLVMRustPrintTargetCPUs(tm, cpu_cstring.as_ptr()) };
        }
        PrintRequest::TargetFeatures => print_target_features(sess, tm),