Update dependencies

Author: a2-ron

Cargo.toml

@@ -25,7 +25,7 @@ bytes = "1.0"
 chrono = { version = "0.4.19", features = ["serde"], optional = true }
 crc32fast = "1.2"
 flate2 = { version = "1.0", default-features = false }
-frunk = { version = "0.3.2", optional = true }
+frunk = { version = "0.4", optional = true }
 lazy_static = "1"
 lexical = "5.2"
 num-bigint = { version = "0.4" }

src/crypto/rsa.rs

@@ -203,8 +203,10 @@ impl PublicKey {
 
 #[cfg(test)]
 mod tests {
+    use std::io::Read;
+
     use super::*;
-    use rand::rngs::adapter::ReadRng;
+    use rand::RngCore;
 
     const SEED: &[u8; 64] = b"\x03\x2e\x45\x32\x6f\xa8\x59\xa7\x2e\xc2\x35\xac\xff\x92\x9b\x15\xd1\
     \x37\x2e\x30\xb2\x07\x25\x5f\x06\x11\xb8\xf7\x85\xd7\x64\x37\x41\x52\xe0\xac\x00\x9e\x50\x9e\
@@ -218,6 +220,39 @@ mod tests {
     \x7a\x25\x19\x29\x85\xa8\x42\xdb\xff\x8e\x13\xef\xee\x5b\x7e\x7e\x55\xbb\xe4\xd3\x89\x64\x7c\
     \x68\x6a\x9a\x9a\xb3\xfb\x88\x9b\x2d\x77\x67\xd3\x83\x7e\xea\x4e\x0a\x2f\x04";
 
+    /// Replacement for the deprecated `rand::ReadRng`.
+    struct Seed<'a>(&'a [u8]);
+
+    impl<'a> RngCore for Seed<'a> {
+        fn next_u32(&mut self) -> u32 {
+            let mut buf = [0; 4];
+            self.fill_bytes(&mut buf);
+            u32::from_le_bytes(buf)
+        }
+
+        fn next_u64(&mut self) -> u64 {
+            let mut buf = [0; 8];
+            self.fill_bytes(&mut buf);
+            u64::from_le_bytes(buf)
+        }
+
+        fn fill_bytes(&mut self, dest: &mut [u8]) {
+            self.try_fill_bytes(dest).unwrap_or_else(|err| {
+                panic!(
+                    "reading random bytes from Read implementation failed; error: {}",
+                    err
+                )
+            });
+        }
+
+        fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> {
+            if dest.is_empty() {
+                return Ok(());
+            }
+            self.0.read_exact(dest).map_err(|e| rand::Error::new(e))
+        }
+    }
+
     #[test]
     fn mgf1() {
         let mask = Pkcs1OaepPadding::<()>::mgf1(&SEED[..], 128);
@@ -292,7 +327,7 @@ mod tests {
             BigUint::from_bytes_be(&exponent),
         );
 
-        let rng = ReadRng::new(&*seed1);
+        let rng = Seed(&*seed1);
         let pad = Pkcs1Padding::new(rng);
 
         let cipher_text = public_key.encrypt_block(msg1, pad);
@@ -344,7 +379,7 @@ mod tests {
             BigUint::from_bytes_be(&exponent),
         );
 
-        let rng = ReadRng::new(&*seed);
+        let rng = Seed(&*seed);
         let pad = Pkcs1OaepPadding::new(rng);
 
         let cipher_text = public_key.encrypt_block(msg, pad);

src/row/convert/frunk.rs

@@ -162,7 +162,7 @@ fn hlist_from_row() {
         .into(),
     );
 
-    let val: frunk::Hlist![
+    let val: frunk::HList![
         u8,
         Vec<u8>,
         u16,