diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-02-17 18:47:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-17 18:47:42 +0100 |
| commit | a387b71b0cd202150b9d9eaa16041b57ef3c8b23 (patch) | |
| tree | 389b55bc90b2b8633cca82a7a2038d4c99744474 /compiler/rustc_codegen_cranelift/src | |
| parent | df3712ce21311bb40b8e446f89c126509821ca4d (diff) | |
| parent | ede99234c48c120b909990ee2ee51dd87cfed6f5 (diff) | |
| download | rust-a387b71b0cd202150b9d9eaa16041b57ef3c8b23.tar.gz rust-a387b71b0cd202150b9d9eaa16041b57ef3c8b23.zip | |
Rollup merge of #121209 - nnethercote:infallible-join_codegen, r=bjorn3
Make `CodegenBackend::join_codegen` infallible. Because they all are, in practice. r? ```@bjorn3```
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/lib.rs b/compiler/rustc_codegen_cranelift/src/lib.rs index 7c432e9c590..7e2e1f7c6ac 100644 --- a/compiler/rustc_codegen_cranelift/src/lib.rs +++ b/compiler/rustc_codegen_cranelift/src/lib.rs @@ -233,11 +233,11 @@ impl CodegenBackend for CraneliftCodegenBackend { ongoing_codegen: Box<dyn Any>, sess: &Session, _outputs: &OutputFilenames, - ) -> Result<(CodegenResults, FxIndexMap<WorkProductId, WorkProduct>), ErrorGuaranteed> { - Ok(ongoing_codegen + ) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) { + ongoing_codegen .downcast::<driver::aot::OngoingCodegen>() .unwrap() - .join(sess, self.config.borrow().as_ref().unwrap())) + .join(sess, self.config.borrow().as_ref().unwrap()) } fn link( |