JMAP protocol layer refactoring (part 2)

crates/utils/src/codec/base32_custom.rs

@@ -132,6 +132,15 @@ impl<'x> Base32Reader<'x> {
         }
     }
 
+    #[allow(clippy::should_implement_trait)]
+    pub fn from_iter(bytes: Iter<'x, u8>) -> Self {
+        Base32Reader {
+            bytes,
+            pos: 0,
+            last_byte: 0,
+        }
+    }
+
     #[inline(always)]
     fn map_byte(&mut self) -> Option<u8> {
         match self.bytes.next() {

crates/utils/src/map/vec_map.rs

@@ -5,7 +5,7 @@
  */
 
 use rkyv::Archive;
-use serde::{Deserialize, Serialize, de::DeserializeOwned, ser::SerializeMap};
+use serde::{Deserialize, Serialize, ser::SerializeMap};
 use std::{borrow::Borrow, cmp::Ordering, fmt, hash::Hash};
 
 // A map implemented using vectors
@@ -304,7 +304,7 @@ struct VecMapVisitor<K, V> {
     phantom: std::marker::PhantomData<(K, V)>,
 }
 
-impl<'de, K: Eq + PartialEq + DeserializeOwned, V: DeserializeOwned> serde::de::Visitor<'de>
+impl<'de, K: Eq + PartialEq + Deserialize<'de>, V: Deserialize<'de>> serde::de::Visitor<'de>
     for VecMapVisitor<K, V>
 {
     type Value = VecMap<K, V>;
@@ -326,7 +326,7 @@ impl<'de, K: Eq + PartialEq + DeserializeOwned, V: DeserializeOwned> serde::de::
     }
 }
 
-impl<'de, K: Eq + PartialEq + DeserializeOwned, V: DeserializeOwned> Deserialize<'de>
+impl<'de, K: Eq + PartialEq + Deserialize<'de>, V: Deserialize<'de>> Deserialize<'de>
     for VecMap<K, V>
 {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>