Merge pull request #4 from Synphonyte/feature/rkyv-8

Feature/rkyv 8

Author: maccesch

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "codee"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 authors = ["Marc-Stefan Cassola"]
 categories = ["encoding"]
@@ -12,18 +12,18 @@ readme = "README.md"
 repository = "https://github.com/Synphonyte/codee"
 
 [dependencies]
-base64 = { version = "0.21", optional = true }
+base64 = { version = "0.22", optional = true }
 bincode = { version = "1", optional = true }
 js-sys = { version = "0.3", optional = true }
 miniserde = { version = "0.1", optional = true }
-prost = { version = "0.12", optional = true }
-rkyv = { version = "0.7", optional = true, features = ["validation", "strict"] }
+prost = { version = "0.13", optional = true }
+rkyv = { version = "0.8.9", optional = true }
 rmp-serde = { version = "1.1", optional = true }
 serde = { version = "1", optional = true }
 serde_json = { version = "1", optional = true }
 serde-lite = { version = "0.5", optional = true }
 serde-wasm-bindgen = { version = "0.6", optional = true }
-thiserror = "1.0.61"
+thiserror = "2.0"
 wasm-bindgen = { version = "0.2", optional = true }
 
 [features]
@@ -38,8 +38,8 @@ json_serde_wasm = ["dep:serde", "dep:serde_json", "dep:js-sys", "dep:serde-wasm-
 [dev-dependencies]
 serde = { version = "1", features = ["derive"] }
 serde-lite = { version = "0.5", features = ["derive"] }
-leptos = "0.6"
-leptos-use = "0.12"
+leptos = "0.7"
+leptos-use = "0.15"
 
 [package.metadata.docs.rs]
 all-features = true

src/binary/rkyv.rs

@@ -1,8 +1,9 @@
 use crate::{Decoder, Encoder};
-use rkyv::de::deserializers::SharedDeserializeMap;
-use rkyv::ser::serializers::AllocSerializer;
-use rkyv::validation::validators::DefaultValidator;
-use rkyv::{Archive, CheckBytes, Deserialize, Fallible, Serialize};
+use rkyv::api::high::{HighSerializer, HighValidator};
+use rkyv::de::Pool;
+use rkyv::rancor::Strategy;
+use rkyv::ser::allocator::ArenaHandle;
+use rkyv::{bytecheck, rancor, Archive, Deserialize, Serialize};
 use std::error::Error;
 use std::sync::Arc;
 
@@ -13,27 +14,28 @@ pub struct RkyvCodec;
 
 impl<T> Encoder<T> for RkyvCodec
 where
-    T: Serialize<AllocSerializer<1024>>,
+    T: for<'a> Serialize<HighSerializer<Vec<u8>, ArenaHandle<'a>, rancor::Error>>,
 {
-    type Error = <AllocSerializer<1024> as Fallible>::Error;
+    type Error = rancor::Error;
     type Encoded = Vec<u8>;
 
     fn encode(val: &T) -> Result<Self::Encoded, Self::Error> {
-        Ok(rkyv::to_bytes::<T, 1024>(val)?.to_vec())
+        rkyv::api::high::to_bytes_in(val, Vec::new())
     }
 }
 
 impl<T> Decoder<T> for RkyvCodec
 where
     T: Archive,
-    for<'a> T::Archived:
-        'a + CheckBytes<DefaultValidator<'a>> + Deserialize<T, SharedDeserializeMap>,
+    for<'a> T::Archived: 'a
+        + bytecheck::CheckBytes<HighValidator<'a, rancor::Error>>
+        + Deserialize<T, Strategy<Pool, rancor::Error>>,
 {
     type Error = Arc<dyn Error>;
     type Encoded = [u8];
 
     fn decode(val: &Self::Encoded) -> Result<T, Self::Error> {
-        rkyv::from_bytes::<T>(val).map_err(|e| Arc::new(e) as Arc<dyn Error>)
+        rkyv::from_bytes::<T, rancor::Error>(val).map_err(|e| Arc::new(e) as Arc<dyn Error>)
     }
 }
 
@@ -44,7 +46,6 @@ mod tests {
     #[test]
     fn test_rkyv_codec() {
         #[derive(Clone, Debug, PartialEq, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
-        #[archive(check_bytes)]
         struct Test {
             s: String,
             i: i32,