Return Vec from util functions instead of iterator.

wojciech-graj · Jul 27, 2024 · 076b90b · 076b90b
1 parent 0e4410b
commit 076b90b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/bin-proto/src/types/array.rs b/bin-proto/src/types/array.rs
@@ -7,7 +7,7 @@ where
 {
     fn read(read: &mut dyn BitRead, byte_order: ByteOrder, ctx: &mut Ctx) -> Result<Self> {
         let elements = util::read_items(N, read, byte_order, ctx)?;
-        Ok(elements.into_iter().collect::<Vec<T>>().try_into().unwrap())
+        Ok(elements.try_into().unwrap())
     }
 }
 

diff --git a/bin-proto/src/types/collections/list.rs b/bin-proto/src/types/collections/list.rs
@@ -31,7 +31,7 @@ macro_rules! impl_list_type {
             where T: $crate::ProtocolRead<Ctx> $( + $ty_pred )*
         {
             fn read(read: &mut dyn $crate::BitRead, byte_order: $crate::ByteOrder, ctx: &mut Ctx) -> $crate::Result<Self> {
-                Ok($crate::util::read_items_to_eof(read, byte_order, ctx)?.collect())
+                Ok($crate::util::read_items_to_eof(read, byte_order, ctx)?.into_iter().collect())
             }
         }
     }

diff --git a/bin-proto/src/types/collections/map.rs b/bin-proto/src/types/collections/map.rs
@@ -43,7 +43,7 @@ macro_rules! impl_map_type {
                     byte_order: $crate::ByteOrder,
                     ctx: &mut Ctx,
                     ) -> $crate::Result<Self> {
-                Ok($crate::util::read_items_to_eof(read, byte_order, ctx)?.collect())
+                Ok($crate::util::read_items_to_eof(read, byte_order, ctx)?.into_iter().collect())
             }
         }
     }

diff --git a/bin-proto/src/types/string.rs b/bin-proto/src/types/string.rs
@@ -1,6 +1,6 @@
 use crate::{
-    util, BitRead, BitWrite, ByteOrder, Error, TaggedRead, UntaggedWrite,
-    FlexibleArrayMemberRead, Result,
+    util, BitRead, BitWrite, ByteOrder, Error, FlexibleArrayMemberRead, Result, TaggedRead,
+    UntaggedWrite,
 };
 
 impl<Tag, Ctx> TaggedRead<Tag, Ctx> for String
@@ -13,13 +13,12 @@ where
         ctx: &mut Ctx,
         tag: Tag,
     ) -> Result<Self> {
-        let bytes: Vec<u8> = util::read_items(
+        let bytes = util::read_items(
             tag.try_into().map_err(|_| Error::TagConvert)?,
             read,
             byte_order,
             ctx,
-        )?
-        .collect();
+        )?;
 
         Ok(String::from_utf8(bytes)?)
     }
@@ -34,7 +33,7 @@ impl<Ctx> UntaggedWrite<Ctx> for String {
 
 impl<Ctx> FlexibleArrayMemberRead<Ctx> for String {
     fn read(read: &mut dyn BitRead, byte_order: ByteOrder, ctx: &mut Ctx) -> Result<Self> {
-        let bytes: Vec<u8> = util::read_items_to_eof(read, byte_order, ctx)?.collect();
+        let bytes = util::read_items_to_eof(read, byte_order, ctx)?;
         Ok(String::from_utf8(bytes)?)
     }
 }

diff --git a/bin-proto/src/util.rs b/bin-proto/src/util.rs
@@ -10,17 +10,16 @@ pub fn read_items<Ctx, T>(
     read: &mut dyn BitRead,
     byte_order: ByteOrder,
     ctx: &mut Ctx,
-) -> Result<impl Iterator<Item = T>>
+) -> Result<Vec<T>>
 where
     T: ProtocolRead<Ctx>,
 {
     let mut elements = Vec::with_capacity(item_count);
-
     for _ in 0..item_count {
         let element = T::read(read, byte_order, ctx)?;
         elements.push(element);
     }
-    Ok(elements.into_iter())
+    Ok(elements)
 }
 
 /// BitWrites an iterator of parcels to the stream.
@@ -45,7 +44,7 @@ pub fn read_items_to_eof<Ctx, T>(
     read: &mut dyn BitRead,
     byte_order: ByteOrder,
     ctx: &mut Ctx,
-) -> Result<impl Iterator<Item = T>>
+) -> Result<Vec<T>>
 where
     T: ProtocolRead<Ctx>,
 {
@@ -55,7 +54,7 @@ where
             Ok(item) => item,
             Err(Error::IO(e)) => {
                 return if e.kind() == io::ErrorKind::UnexpectedEof {
-                    Ok(items.into_iter())
+                    Ok(items)
                 } else {
                     Err(e.into())
                 }