Merge pull request #15 from GiGainfosystems/update_to_bincode_2

Update to bincode 2

Author: weiznich

Cargo.lock

@@ -57,16 +57,25 @@ impl From<Box<dyn Any + Send>> for SerializableError {
     }
 }
 
-impl From<Box<bincode::ErrorKind>> for SerializableError {
-    fn from(value: Box<bincode::ErrorKind>) -> Self {
+impl From<bincode::error::DecodeError> for SerializableError {
+    fn from(value: bincode::error::DecodeError) -> Self {
         Self {
-            message: format!("Bincode: {value}"),
+            message: format!("Bincode Decode Error: {value}"),
         }
     }
 }
+
+impl From<bincode::error::EncodeError> for SerializableError {
+    fn from(value: bincode::error::EncodeError) -> Self {
+        Self {
+            message: format!("Bincode Encode Error: {value}"),
+        }
+    }
+}
+
 ```
 
-Note that the module, the error itself, and the fields on the error need to be public. If that is not the case, you should receive an error during code generation that points you to this issue. You will have to add [Serde](https://crates.io/crates/serde) and [Bincode](https://crates.io/crates/bincode) to your crate for this to work.
+Note that the module, the error itself, and the fields on the error need to be public. If that is not the case, you should receive an error during code generation that points you to this issue. You will have to add [Serde](https://crates.io/crates/serde) and [Bincode 2](https://crates.io/crates/bincode) to your crate for this to work.
 
 Furthermore, to release any memory allocated by the Rust side of your API, you will have to include a function for the C++ side to release memory. This function looks like this:
 

README.md

@@ -1,7 +1,7 @@
 [package]
 name = "buffi"
 description = "A tool to generate ergonomic, buffer-based C++ APIs."
-version = "0.2.7+rust.1.86.0"
+version = "0.3.0+rust.1.86.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 documentation = "https://docs.rs/buffi"

buffi/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "buffi_macro"
 description = "A proc-macro to generate ergonomic, buffer-based C++ APIs."
-version = "0.2.7"
+version = "0.3.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 documentation = "https://docs.rs/buffi_macro"

buffi_macro/Cargo.toml

@@ -146,7 +146,7 @@ fn generate_exported_function<'a>(
                         std::slice::from_raw_parts(#n, #n_size)
                     }
                 };
-                let #n = bincode::deserialize(slice)?;
+                let #n = bincode::serde::decode_from_slice(slice, bincode::config::legacy())?.0;
             })
         } else {
             None
@@ -286,14 +286,14 @@ fn generate_exported_function<'a>(
                     Err(crate::errors::SerializableError::from(e))
                 }
             };
-            let bytes = match bincode::serialize(&res) {
+            let bytes = match bincode::serde::encode_to_vec(&res, bincode::config::legacy()) {
                 Ok(bytes) => {
                     bytes
                 }
                 Err(e) => {
                     #tracing_serializable_w
                     res = Err(e.into());
-                    match bincode::serialize(&res) {
+                    match bincode::serde::encode_to_vec(&res, bincode::config::legacy()) {
                         Ok(bytes) => {
                             bytes
                         }

buffi_macro/src/proc_macro.rs

@@ -9,7 +9,7 @@ crate-type = ["staticlib"]
 
 [dependencies]
 buffi_macro = { path = "../../buffi_macro" }
-bincode = "1.3.3"
+bincode = { version = "2.0.1", features = ["std", "serde"], default-features = false }
 serde = { version = "1.0.214", features = ["derive"] }
 tokio = { version = "1.41.1", features = ["rt-multi-thread"] }
 cgmath = { version = "0.18.0", features = ["serde"] }

example/buffi_example/Cargo.toml

@@ -24,10 +24,18 @@ impl From<Box<dyn Any + Send>> for SerializableError {
     }
 }
 
-impl From<Box<bincode::ErrorKind>> for SerializableError {
-    fn from(value: Box<bincode::ErrorKind>) -> Self {
+impl From<bincode::error::DecodeError> for SerializableError {
+    fn from(value: bincode::error::DecodeError) -> Self {
         Self {
-            message: format!("Bincode: {value}"),
+            message: format!("Bincode Decode Error: {value}"),
+        }
+    }
+}
+
+impl From<bincode::error::EncodeError> for SerializableError {
+    fn from(value: bincode::error::EncodeError) -> Self {
+        Self {
+            message: format!("Bincode Encode Error: {value}"),
         }
     }
 }