Skip to content

Commit 7b1ac28

Browse files
committed
Make CodegenBackend::join_codegen infallible.
Because they all are, in practice.
1 parent 5a12a89 commit 7b1ac28

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/lib.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,11 @@ impl CodegenBackend for GccCodegenBackend {
217217
Box::new(res)
218218
}
219219

220-
fn join_codegen(&self, ongoing_codegen: Box<dyn Any>, sess: &Session, _outputs: &OutputFilenames) -> Result<(CodegenResults, FxIndexMap<WorkProductId, WorkProduct>), ErrorGuaranteed> {
221-
let (codegen_results, work_products) = ongoing_codegen
220+
fn join_codegen(&self, ongoing_codegen: Box<dyn Any>, sess: &Session, _outputs: &OutputFilenames) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) {
221+
ongoing_codegen
222222
.downcast::<rustc_codegen_ssa::back::write::OngoingCodegen<GccCodegenBackend>>()
223223
.expect("Expected GccCodegenBackend's OngoingCodegen, found Box<Any>")
224-
.join(sess);
225-
226-
Ok((codegen_results, work_products))
224+
.join(sess)
227225
}
228226

229227
fn link(&self, sess: &Session, codegen_results: CodegenResults, outputs: &OutputFilenames) -> Result<(), ErrorGuaranteed> {

0 commit comments

Comments
 (0)