fix(deps): replace lazycell with Mutex<Option<T>>, add MSRV 1.70, drop rustc_1_55 tinyvec feature

toad-array/Cargo.toml

@@ -2,6 +2,7 @@
 name = "toad-array"
 version = "0.8.0"
 edition = "2021"
+rust-version = "1.70"
 description = "Array trait used by the toad ecosystem to abstract over heap or heapless collections"
 authors = ["Orion Kindel <cakekindel@gmail.com>"]
 license = "MIT OR Apache-2.0"
@@ -22,5 +23,5 @@ test = []
 docs = []
 
 [dependencies]
-tinyvec = {version = "1.5", default_features = false, features = ["rustc_1_55"]}
+tinyvec = {version = "1.5", default_features = false, features = ["alloc", "rustc_1_55"]}
 toad-len = {version = "^0.1.2", default_features = false}

toad-array/src/lib.rs

@@ -36,8 +36,7 @@ use toad_len::Len;
 
 /// Operations on ordered indexed collections
 pub trait Indexed<T>
-where
-  Self: Len + Deref<Target = [T]>,
+  where Self: Len + Deref<Target = [T]>
 {
   /// Insert a new element at `ix`, shifting all other elements to the right.
   ///
@@ -182,8 +181,7 @@ where
   /// assert_eq!(v, vec![5]);
   /// ```
   fn drop_while<F>(&mut self, f: F)
-  where
-    F: for<'a> Fn(&'a T) -> bool,
+    where F: for<'a> Fn(&'a T) -> bool
   {
     match self.get(0) {
       | Some(t) if !f(&t) => return,
@@ -202,8 +200,7 @@ where
 /// - `Vec` is `Reserve`, and invokes `Vec::with_capacity`
 /// - `tinyvec::ArrayVec` is `Reserve` and invokes `Default::default()` because creating an `ArrayVec` automatically allocates the required space on the stack.
 pub trait Reserve
-where
-  Self: Default,
+  where Self: Default
 {
   /// Create an instance of the collection with a given capacity.
   ///
@@ -221,8 +218,7 @@ where
 ///
 /// If self was longer, drops elements up to `len`
 pub trait Trunc
-where
-  Self: Sized,
+  where Self: Sized
 {
   #[allow(missing_docs)]
   fn trunc(&mut self, len: usize) -> ();
@@ -240,9 +236,7 @@ impl<T> Trunc for Vec<T> {
   }
 }
 
-impl<T, const N: usize> Trunc for tinyvec::ArrayVec<[T; N]>
-where
-  T: Default,
+impl<T, const N: usize> Trunc for tinyvec::ArrayVec<[T; N]> where T: Default
 {
   fn trunc(&mut self, len: usize) -> () {
     self.truncate(len)
@@ -257,24 +251,21 @@ where
 pub trait Filled<T>: Sized {
   #[allow(missing_docs)]
   fn filled(t: T) -> Option<Self>
-  where
-    T: Copy,
+    where T: Copy
   {
     Self::filled_using(|| t)
   }
 
   #[allow(missing_docs)]
   fn filled_default() -> Option<Self>
-  where
-    T: Default,
+    where T: Default
   {
     Self::filled_using(|| Default::default())
   }
 
   #[allow(missing_docs)]
   fn filled_using<F>(f: F) -> Option<Self>
-  where
-    F: Fn() -> T;
+    where F: Fn() -> T;
 }
 
 #[cfg(feature = "alloc")]
@@ -287,29 +278,24 @@ impl<T> Reserve for Vec<T> {
 #[cfg(feature = "alloc")]
 impl<T> Filled<T> for Vec<T> {
   fn filled_using<F>(_: F) -> Option<Self>
-  where
-    F: Fn() -> T,
+    where F: Fn() -> T
   {
     None
   }
 }
 
 impl<A: tinyvec::Array> Reserve for tinyvec::ArrayVec<A> {}
 
-impl<T, const N: usize> Filled<T> for tinyvec::ArrayVec<[T; N]>
-where
-  T: Default,
+impl<T, const N: usize> Filled<T> for tinyvec::ArrayVec<[T; N]> where T: Default
 {
   fn filled_using<F>(f: F) -> Option<Self>
-  where
-    F: Fn() -> T,
+    where F: Fn() -> T
   {
     Some(core::iter::repeat(()).take(N).map(|_| f()).collect())
   }
 
   fn filled(t: T) -> Option<Self>
-  where
-    T: Copy,
+    where T: Copy
   {
     Some(Self::from([t; N]))
   }
@@ -361,8 +347,7 @@ pub trait Array:
 
 /// Collections that support extending themselves mutably from copyable slices
 pub trait AppendCopy<T>
-where
-  T: Copy,
+  where T: Copy
 {
   /// Extend self mutably, copying from a slice.
   ///
@@ -375,19 +360,16 @@ where
 }
 
 #[cfg(feature = "alloc")]
-impl<T> AppendCopy<T> for Vec<T>
-where
-  T: Copy,
+impl<T> AppendCopy<T> for Vec<T> where T: Copy
 {
   fn append_copy(&mut self, i: &[T]) {
     self.extend(i);
   }
 }
 
 impl<T, A> AppendCopy<T> for tinyvec::ArrayVec<A>
-where
-  T: Copy,
-  A: tinyvec::Array<Item = T>,
+  where T: Copy,
+        A: tinyvec::Array<Item = T>
 {
   fn append_copy(&mut self, i: &[T]) {
     self.extend_from_slice(i);
@@ -415,17 +397,15 @@ impl<T> Indexed<T> for Vec<T> {
 }
 
 impl<A, T> Array for tinyvec::ArrayVec<A>
-where
-  Self: Filled<T> + Trunc,
-  A: tinyvec::Array<Item = T>,
+  where Self: Filled<T> + Trunc,
+        A: tinyvec::Array<Item = T>
 {
   type Item = T;
 }
 
 impl<A> Indexed<A::Item> for tinyvec::ArrayVec<A>
-where
-  Self: Filled<A::Item> + Trunc,
-  A: tinyvec::Array,
+  where Self: Filled<A::Item> + Trunc,
+        A: tinyvec::Array
 {
   fn insert(&mut self, ix: usize, t: A::Item) {
     tinyvec::ArrayVec::insert(self, ix, t)

toad-common/Cargo.toml

@@ -2,6 +2,7 @@
 name = "toad-common"
 version = "0.15.0"
 edition = "2021"
+rust-version = "1.70"
 description = "Common structs and abstractions used by toad"
 authors = ["Orion Kindel <cakekindel@gmail.com>"]
 license = "MIT OR Apache-2.0"
@@ -22,5 +23,5 @@ test = []
 docs = []
 
 [dependencies]
-tinyvec = {version = "1.5", default_features = false, features = ["rustc_1_55"]}
+tinyvec = {version = "1.5", default_features = false, features = ["alloc", "rustc_1_55"]}
 blake2 = "0.10"

toad-common/src/array.rs

@@ -103,8 +103,7 @@ pub trait Reserve: Default {
 ///
 /// If self was longer, drops elements up to `len`
 pub trait Trunc
-where
-  Self: Sized,
+  where Self: Sized
 {
   #[allow(missing_docs)]
   fn trunc(&mut self, len: usize) -> ();
@@ -122,9 +121,7 @@ impl<T> Trunc for Vec<T> {
   }
 }
 
-impl<T, const N: usize> Trunc for tinyvec::ArrayVec<[T; N]>
-where
-  T: Default,
+impl<T, const N: usize> Trunc for tinyvec::ArrayVec<[T; N]> where T: Default
 {
   fn trunc(&mut self, len: usize) -> () {
     self.truncate(len)
@@ -139,24 +136,21 @@ where
 pub trait Filled<T>: Sized {
   #[allow(missing_docs)]
   fn filled(t: T) -> Option<Self>
-  where
-    T: Copy,
+    where T: Copy
   {
     Self::filled_using(|| t)
   }
 
   #[allow(missing_docs)]
   fn filled_default() -> Option<Self>
-  where
-    T: Default,
+    where T: Default
   {
     Self::filled_using(|| Default::default())
   }
 
   #[allow(missing_docs)]
   fn filled_using<F>(f: F) -> Option<Self>
-  where
-    F: Fn() -> T;
+    where F: Fn() -> T;
 }
 
 #[cfg(feature = "alloc")]
@@ -169,29 +163,24 @@ impl<T> Reserve for Vec<T> {
 #[cfg(feature = "alloc")]
 impl<T> Filled<T> for Vec<T> {
   fn filled_using<F>(_: F) -> Option<Self>
-  where
-    F: Fn() -> T,
+    where F: Fn() -> T
   {
     None
   }
 }
 
 impl<A: tinyvec::Array> Reserve for tinyvec::ArrayVec<A> {}
 
-impl<T, const N: usize> Filled<T> for tinyvec::ArrayVec<[T; N]>
-where
-  T: Default,
+impl<T, const N: usize> Filled<T> for tinyvec::ArrayVec<[T; N]> where T: Default
 {
   fn filled_using<F>(f: F) -> Option<Self>
-  where
-    F: Fn() -> T,
+    where F: Fn() -> T
   {
     Some(core::iter::repeat(()).take(N).map(|_| f()).collect())
   }
 
   fn filled(t: T) -> Option<Self>
-  where
-    T: Copy,
+    where T: Copy
   {
     Some(Self::from([t; N]))
   }
@@ -293,9 +282,7 @@ impl<T> Array for Vec<T> {
   }
 }
 
-impl<A: tinyvec::Array<Item = T>, T> Array for tinyvec::ArrayVec<A>
-where
-  Self: Filled<T> + Trunc,
+impl<A: tinyvec::Array<Item = T>, T> Array for tinyvec::ArrayVec<A> where Self: Filled<T> + Trunc
 {
   type Item = T;
 

toad-common/src/cursor.rs

@@ -73,22 +73,25 @@ impl<T: AsRef<[u8]>> Cursor<T> {
   #[allow(clippy::should_implement_trait)]
   pub fn next(&mut self) -> Option<u8> {
     self.take_exact(1).and_then(|a| match a {
-      | &[a] => Some(a),
-      | _ => None,
-    })
+                        | &[a] => Some(a),
+                        | _ => None,
+                      })
   }
 
   /// Take `n` bytes from the cursor, stopping early if
   /// the end of the buffer is encountered.
   ///
   /// Runs in O(1) time.
   pub fn take(&mut self, n: usize) -> &[u8] {
-    Self::peek_(self.len, self.cursor, &self.t, n)
-      .map(|a| {
-        Self::skip_(&mut self.cursor, self.len, n);
-        a
-      })
-      .unwrap_or_else(|| Self::take_until_end_(&mut self.cursor, self.len, &self.t))
+    Self::peek_(self.len, self.cursor, &self.t, n).map(|a| {
+                                                    Self::skip_(&mut self.cursor, self.len, n);
+                                                    a
+                                                  })
+                                                  .unwrap_or_else(|| {
+                                                    Self::take_until_end_(&mut self.cursor,
+                                                                          self.len,
+                                                                          &self.t)
+                                                  })
   }
 
   /// Take `n` bytes from the cursor, returning None if
@@ -97,9 +100,9 @@ impl<T: AsRef<[u8]>> Cursor<T> {
   /// Runs in O(1) time.
   pub fn take_exact(&mut self, n: usize) -> Option<&[u8]> {
     Self::peek_(self.len, self.cursor, &self.t, n).map(|a| {
-      Self::skip_(&mut self.cursor, self.len, n);
-      a
-    })
+                                                    Self::skip_(&mut self.cursor, self.len, n);
+                                                    a
+                                                  })
   }
 
   /// Without advancing the position, look at the next
@@ -140,16 +143,15 @@ impl<T: AsRef<[u8]>> Cursor<T> {
       return &[];
     }
 
-    (self.cursor..self.len)
-      .into_iter()
-      .take_while(|ix| f(self.t.as_ref()[*ix]))
-      .last()
-      .map(|end_ix| {
-        let out = &self.t.as_ref()[self.cursor..=end_ix];
-        self.cursor = end_ix + 1;
-        out
-      })
-      .unwrap_or(&[])
+    (self.cursor..self.len).into_iter()
+                           .take_while(|ix| f(self.t.as_ref()[*ix]))
+                           .last()
+                           .map(|end_ix| {
+                             let out = &self.t.as_ref()[self.cursor..=end_ix];
+                             self.cursor = end_ix + 1;
+                             out
+                           })
+                           .unwrap_or(&[])
   }
 
   /// Whether the cursor has reached the end
@@ -267,9 +269,8 @@ mod tests {
   #[test]
   pub fn take_while() {
     let til_slash = |c: &mut Cursor<&str>| {
-      core::str::from_utf8(c.take_while(|b| (b as char) != '/'))
-        .unwrap()
-        .to_string()
+      core::str::from_utf8(c.take_while(|b| (b as char) != '/')).unwrap()
+                                                                .to_string()
     };
 
     let mut cur = Cursor::new("abc/def");

toad-common/src/hash.rs

@@ -44,8 +44,8 @@ impl Blake2Hasher {
 impl Debug for Blake2Hasher {
   fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
     f.debug_tuple("Blake2Hasher")
-      .field(&"<Blake2bCore<U8>>")
-      .finish()
+     .field(&"<Blake2bCore<U8>>")
+     .finish()
   }
 }