about summary refs log tree commit diff
path: root/src/lib.rs
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-02-17 18:47:42 +0100
committerGitHub <noreply@github.com>2024-02-17 18:47:42 +0100
commitf7143af56c3f364c1aa3e94de6f6ae883e1076b7 (patch)
tree3ea4109baf34b5b3b54e321c9cc7d353d52db80d /src/lib.rs
parentaa6d02f3681eb7d0f60a27eda4efe7cee56ca196 (diff)
parent0fd329b96a613dafb6c3efbf2d17677d6eef417a (diff)
downloadrust-f7143af56c3f364c1aa3e94de6f6ae883e1076b7.tar.gz
rust-f7143af56c3f364c1aa3e94de6f6ae883e1076b7.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 'src/lib.rs')
-rw-r--r--src/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 7c432e9c590..7e2e1f7c6ac 100644
--- a/src/lib.rs
+++ b/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(