cleaner note_iter_into_vec

khan5ula · Oct 11, 2024 · 54f561b · 54f561b
1 parent a4c71c8
commit 54f561b
Showing 1 changed file with 8 additions and 19 deletions.
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -62,23 +62,12 @@ pub fn note_iter_into_vec<I>(iterator: I) -> Result<Vec<Note>, NoteError>
 where
     I: IntoIterator<Item = Result<Result<Note, String>, Error>>,
 {
-    let mut result: Vec<Note> = vec![];
-
-    for iter_result in iterator {
-        match iter_result {
-            Ok(note_result) => match note_result {
-                Ok(note) => {
-                    result.push(note);
-                }
-                Err(e) => {
-                    return Err(NoteError::UnwrapNoteError(e));
-                }
-            },
-            Err(e) => {
-                return Err(NoteError::RustqliteError(e));
-            }
-        }
-    }
-
-    Ok(result)
+    iterator
+        .into_iter()
+        .map(|iter_result| {
+            iter_result
+                .map_err(NoteError::RustqliteError)?
+                .map_err(NoteError::UnwrapNoteError)
+        })
+        .collect()
 }