From da793e6faea8e6eaa4e42f6fb1111eda48d23b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= <emil.gardstrom@gmail.com>
Date: Sat, 6 Apr 2024 00:06:14 +0200
Subject: [PATCH] simplify sample collection

---
 ic10emu/src/lib.rs | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/ic10emu/src/lib.rs b/ic10emu/src/lib.rs
index ea15419..a41db7a 100644
--- a/ic10emu/src/lib.rs
+++ b/ic10emu/src/lib.rs
@@ -725,10 +725,8 @@ impl VM {
         let samples = self
             .batch_device(source, prefab, None)
             .map(|device| device.borrow_mut().get_field(typ))
-            .collect::<Result<Vec<_>, ICError>>()?
-            .into_iter()
-            .filter(|val| !val.is_nan())
-            .collect_vec();
+            .filter_ok(|val| !val.is_nan())
+            .collect::<Result<Vec<_>, ICError>>()?;
         Ok(mode.apply(&samples))
     }
 
@@ -743,10 +741,8 @@ impl VM {
         let samples = self
             .batch_device(source, prefab, Some(name))
             .map(|device| device.borrow_mut().get_field(typ))
-            .collect::<Result<Vec<_>, ICError>>()?
-            .into_iter()
-            .filter(|val| !val.is_nan())
-            .collect_vec();
+            .filter_ok(|val| !val.is_nan())
+            .collect::<Result<Vec<_>, ICError>>()?;
         Ok(mode.apply(&samples))
     }
 
@@ -762,10 +758,8 @@ impl VM {
         let samples = self
             .batch_device(source, prefab, Some(name))
             .map(|device| device.borrow().get_slot_field(index, typ))
-            .collect::<Result<Vec<_>, ICError>>()?
-            .into_iter()
-            .filter(|val| !val.is_nan())
-            .collect_vec();
+            .filter_ok(|val| !val.is_nan())
+            .collect::<Result<Vec<_>, ICError>>()?;
         Ok(mode.apply(&samples))
     }
 
@@ -780,10 +774,8 @@ impl VM {
         let samples = self
             .batch_device(source, prefab, None)
             .map(|device| device.borrow().get_slot_field(index, typ))
-            .collect::<Result<Vec<_>, ICError>>()?
-            .into_iter()
-            .filter(|val| !val.is_nan())
-            .collect_vec();
+            .filter_ok(|val| !val.is_nan())
+            .collect::<Result<Vec<_>, ICError>>()?;
         Ok(mode.apply(&samples))
     }
 }