From e7d570ddd9c67c00627acc8007a711d533351601 Mon Sep 17 00:00:00 2001
From: dheaton-arm <Damian.Heaton@arm.com>
Date: Fri, 10 Sep 2021 12:26:48 +0100
Subject: [PATCH] Collect into Result rather than unwrap

Copyright (c) 2021, Arm Limited
---
 cranelift/interpreter/src/step.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cranelift/interpreter/src/step.rs b/cranelift/interpreter/src/step.rs
index 2df9888e64..2c3313af1a 100644
--- a/cranelift/interpreter/src/step.rs
+++ b/cranelift/interpreter/src/step.rs
@@ -685,8 +685,8 @@ where
             } else {
                 let lanes = extractlanes(&arg(0)?, ctrl_ty.lane_type())?
                     .into_iter()
-                    .map(|lane| lane.count_ones().unwrap())
-                    .collect::<SimdVec<V>>();
+                    .map(|lane| lane.count_ones())
+                    .collect::<ValueResult<SimdVec<V>>>()?;
                 vectorizelanes(&lanes, ctrl_ty)?
             };
             assign(count)