Back to the first version apparently

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 13 insertions, 17 deletions

diff --git a/bin/domain/imag-mail/src/lib.rs b/bin/domain/imag-mail/src/lib.rs
index f9bc966a..2af2055e 100644
--- a/bin/domain/imag-mail/src/lib.rs
+++ b/bin/domain/imag-mail/src/lib.rs
@@ -201,8 +201,8 @@ fn list(rt: &Runtime) -> Result<()> {
         where I: Iterator<Item = Result<FileLockEntry<'a>>>
     {
         debug!("Processing tree");
-        let ids : Vec<_> = if find_root {
-            iter.and_then_ok(|fle| {
+        let iter = if find_root {
+            let iter = iter.and_then_ok(|fle| {
                 trace!("Loading: {}", fle.get_location());
                 let id = fle
                     .load(conn)?
@@ -214,25 +214,21 @@ fn list(rt: &Runtime) -> Result<()> {
 
                 drop(fle);
                 id
-            })
+            });
 
-            // we have to collect here, so that all FLEs are drop()ed
-            .collect::<Result<Vec<String>>>()?
-            .into_iter()
-            .map(|id: String| mailstore.get_mailtree(&id))
-            .collect::<Result<Vec<Mailtree>>>()
+            Box::new(iter) as Box<dyn Iterator<Item = Result<String>>>
         } else {
-            iter.and_then_ok(|fle| fle.get_cached_id())
-                // we have to collect here, so that all FLEs are drop()ed
-                .collect::<Result<Vec<String>>>()?
-                .into_iter()
-                .map(|id: String| mailstore.get_mailtree(&id))
-                .collect::<Result<Vec<Mailtree>>>()
-        }?;
+            let iter = iter.and_then_ok(|fle| fle.get_cached_id());
+            Box::new(iter) as Box<dyn Iterator<Item = Result<String>>>
+        };
 
         trace!("Printing mailtrees now!");
-        ids.into_iter()
-            .map(|mt| print_traverse(&mailstore, mt, i, conn, list_format, rt, out))
+
+        // we have to collect here, so that all FLEs are drop()ed
+        iter.collect::<Result<Vec<String>>>()?
+            .into_iter()
+            .map(|id: String| mailstore.get_mailtree(&id))
+            .and_then_ok(|mt| print_traverse(&mailstore, mt, i, conn, list_format, rt, out))
             .collect::<Result<Vec<_>>>()
             .map(|_| ())
     }