Fix return type.

lambdaclass · Nov 14, 2024 · 7fb4d30 · 7fb4d30
1 parent cba2bd4
commit 7fb4d30
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/compiler.rs b/src/compiler.rs
@@ -614,9 +614,8 @@ fn compile_func(
                         invocation
                             .branches
                             .iter()
-                            .zip(helper.results())
+                            .zip(helper.results()?)
                             .map(|(branch_info, result_values)| {
-                                let result_values = result_values?;
                                 assert_eq!(
                                     branch_info.results.len(),
                                     result_values.len(),
@@ -625,10 +624,7 @@ fn compile_func(
 
                                 Ok(edit_state::put_results(
                                     state.clone(),
-                                    branch_info
-                                        .results
-                                        .iter()
-                                        .zip(result_values.iter().copied()),
+                                    branch_info.results.iter().zip(result_values.into_iter()),
                                 )?)
                             })
                             .collect::<Result<_, Error>>()?,

diff --git a/src/libfuncs.rs b/src/libfuncs.rs
@@ -3,7 +3,7 @@
 //! Contains libfunc generation stuff (aka. the actual instructions).
 
 use crate::{
-    error::{Error as CoreLibfuncBuilderError, Result},
+    error::{panic::ToNativeAssertError, Error as CoreLibfuncBuilderError, Result},
     metadata::MetadataStorage,
     types::TypeBuilder,
     utils::BlockExt,
@@ -280,17 +280,21 @@ where
     'this: 'ctx,
 {
     #[doc(hidden)]
-    pub(crate) fn results(self) -> impl Iterator<Item = NativeResult<Vec<Value<'ctx, 'this>>>> {
-        self.results.into_iter().enumerate().map(|(branch_idx, x)| {
-            x.into_iter()
-                .enumerate()
-                .map(|(arg_idx, x)| {
-                    x.into_inner().to_native_assert_error(&format!(
-                        "Argument #{arg_idx} of branch {branch_idx} doesn't have a value."
-                    ))
-                })
-                .collect()
-        })
+    pub(crate) fn results(self) -> Result<Vec<Vec<Value<'ctx, 'this>>>> {
+        self.results
+            .into_iter()
+            .enumerate()
+            .map(|(branch_idx, x)| {
+                x.into_iter()
+                    .enumerate()
+                    .map(|(arg_idx, x)| {
+                        x.into_inner().to_native_assert_error(&format!(
+                            "Argument #{arg_idx} of branch {branch_idx} doesn't have a value."
+                        ))
+                    })
+                    .collect()
+            })
+            .collect()
     }
 
     /// Return the initialization block.