Skip to content

Commit f7143af

Browse files
authored
Rollup merge of rust-lang#121209 - nnethercote:infallible-join_codegen, r=bjorn3
Make `CodegenBackend::join_codegen` infallible. Because they all are, in practice. r? ```@bjorn3```
2 parents aa6d02f + 0fd329b commit f7143af

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,11 @@ impl CodegenBackend for CraneliftCodegenBackend {
233233
ongoing_codegen: Box<dyn Any>,
234234
sess: &Session,
235235
_outputs: &OutputFilenames,
236-
) -> Result<(CodegenResults, FxIndexMap<WorkProductId, WorkProduct>), ErrorGuaranteed> {
237-
Ok(ongoing_codegen
236+
) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) {
237+
ongoing_codegen
238238
.downcast::<driver::aot::OngoingCodegen>()
239239
.unwrap()
240-
.join(sess, self.config.borrow().as_ref().unwrap()))
240+
.join(sess, self.config.borrow().as_ref().unwrap())
241241
}
242242

243243
fn link(

0 commit comments

Comments
 (0)