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_llvm/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_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index e688e84db61..35210b0b2e8 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -369,7 +369,7 @@ impl CodegenBackend for LlvmCodegenBackend { ongoing_codegen: Box<dyn Any>, sess: &Session, outputs: &OutputFilenames, - ) -> Result<(CodegenResults, FxIndexMap<WorkProductId, WorkProduct>), ErrorGuaranteed> { + ) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) { let (codegen_results, work_products) = ongoing_codegen .downcast::<rustc_codegen_ssa::back::write::OngoingCodegen<LlvmCodegenBackend>>() .expect("Expected LlvmCodegenBackend's OngoingCodegen, found Box<Any>") @@ -382,7 +382,7 @@ impl CodegenBackend for LlvmCodegenBackend { }); } - Ok((codegen_results, work_products)) + (codegen_results, work_products) } fn link( |