Skip to content

Commit 1dc3ab0

Browse files
committed
Format sources into the error message when loading codegen backends
cc rust-lang/rustc_codegen_cranelift#1447
1 parent fcaeb45 commit 1dc3ab0

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

compiler/rustc_codegen_cranelift/Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,12 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
246246

247247
[[package]]
248248
name = "libloading"
249-
version = "0.7.4"
249+
version = "0.8.1"
250250
source = "registry+https://github.com/rust-lang/crates.io-index"
251-
checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
251+
checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
252252
dependencies = [
253253
"cfg-if",
254-
"winapi",
254+
"windows-sys",
255255
]
256256

257257
[[package]]

compiler/rustc_interface/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#![feature(box_patterns)]
22
#![feature(decl_macro)]
3+
#![feature(error_iter)]
34
#![feature(internal_output_capture)]
4-
#![feature(thread_spawn_unchecked)]
55
#![feature(lazy_cell)]
66
#![feature(let_chains)]
7+
#![feature(thread_spawn_unchecked)]
78
#![feature(try_blocks)]
89
#![recursion_limit = "256"]
910
#![deny(rustc::untranslatable_diagnostic)]

compiler/rustc_interface/src/util.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,21 @@ pub(crate) fn run_in_thread_pool_with_globals<F: FnOnce() -> R + Send, R: Send>(
162162
}
163163

164164
fn load_backend_from_dylib(early_dcx: &EarlyDiagCtxt, path: &Path) -> MakeBackendFn {
165+
fn format_err(e: &(dyn std::error::Error + 'static)) -> String {
166+
e.sources().map(|e| format!(": {e}")).collect()
167+
}
165168
let lib = unsafe { Library::new(path) }.unwrap_or_else(|err| {
166-
let err = format!("couldn't load codegen backend {path:?}: {err}");
169+
let err = format!("couldn't load codegen backend {path:?}{}", format_err(&err));
167170
early_dcx.early_fatal(err);
168171
});
169172

170173
let backend_sym = unsafe { lib.get::<MakeBackendFn>(b"__rustc_codegen_backend") }
171174
.unwrap_or_else(|e| {
172-
let err = format!("couldn't load codegen backend: {e}");
173-
early_dcx.early_fatal(err);
175+
let e = format!(
176+
"`__rustc_codegen_backend` symbol lookup in the codegen backend failed{}",
177+
format_err(&e)
178+
);
179+
early_dcx.early_fatal(e);
174180
});
175181

176182
// Intentionally leak the dynamic library. We can't ever unload it

0 commit comments

Comments
 (0)