Merge pull request #17 from serde-rs/bincode

Update to bincode 2

Author: dtolnay

Cargo.toml

@@ -17,7 +17,7 @@ byteorder = "1.4.3"
 serde = "1.0.166"
 
 [dev-dependencies]
-bincode = "1.0"
+bincode = { version = "2", features = ["derive", "serde"] }
 postcard = { version = "1.0", features = ["use-std"] }
 serde = { version = "1.0", features = ["derive"] }
 

benches/bincode.rs

@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
 use std::hint::black_box;
 use test::Bencher;
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, bincode::Encode, bincode::Decode)]
 struct Foo {
     bar: String,
     baz: u64,
@@ -28,25 +28,49 @@ impl Default for Foo {
 }
 
 #[bench]
-fn bincode_deserialize(b: &mut Bencher) {
+fn bincode_serde_deserialize(b: &mut Bencher) {
     let foo = Foo::default();
-    let bytes = bincode::serialize(&foo).unwrap();
+    let bytes = bincode::serde::encode_to_vec(&foo, bincode::config::standard()).unwrap();
 
     b.iter(|| {
         let bytes = black_box(&bytes);
-        bincode::deserialize::<Foo>(bytes).unwrap()
+        bincode::serde::decode_from_slice::<Foo, _>(bytes, bincode::config::standard()).unwrap()
     });
 }
 
 #[bench]
-fn bincode_serialize(b: &mut Bencher) {
+fn bincode_serde_serialize(b: &mut Bencher) {
     let foo = Foo::default();
     let mut bytes = Vec::with_capacity(128);
 
     b.iter(|| {
         let foo = black_box(&foo);
         bytes.clear();
-        bincode::serialize_into(&mut bytes, foo).unwrap();
+        bincode::serde::encode_into_std_write(foo, &mut bytes, bincode::config::standard())
+            .unwrap();
+    });
+}
+
+#[bench]
+fn bincode_decode(b: &mut Bencher) {
+    let foo = Foo::default();
+    let bytes = bincode::encode_to_vec(&foo, bincode::config::standard()).unwrap();
+
+    b.iter(|| {
+        let bytes = black_box(&bytes);
+        bincode::decode_from_slice::<Foo, _>(bytes, bincode::config::standard()).unwrap()
+    });
+}
+
+#[bench]
+fn bincode_encode(b: &mut Bencher) {
+    let foo = Foo::default();
+    let mut bytes = Vec::with_capacity(128);
+
+    b.iter(|| {
+        let foo = black_box(&foo);
+        bytes.clear();
+        bincode::encode_into_std_write(foo, &mut bytes, bincode::config::standard()).unwrap();
     });
 }
 

tests/bincode.rs

@@ -27,7 +27,7 @@ impl Default for Foo {
 fn test_ser() {
     let foo = Foo::default();
 
-    let bincode_bytes = bincode::serialize(&foo).unwrap();
+    let bincode_bytes = bincode::serde::encode_to_vec(&foo, bincode::config::legacy()).unwrap();
 
     let mut serde_bytes = Vec::new();
     serde_bench::serialize(&mut serde_bytes, &foo).unwrap();
@@ -41,7 +41,10 @@ fn test_de() {
     let mut bytes = Vec::new();
     serde_bench::serialize(&mut bytes, &foo).unwrap();
 
-    let bincode_foo = bincode::deserialize::<Foo>(&bytes).unwrap();
+    let bincode_foo =
+        bincode::serde::decode_from_slice::<Foo, _>(&bytes, bincode::config::legacy())
+            .unwrap()
+            .0;
     assert_eq!(bincode_foo, foo);
 
     let serde_foo = serde_bench::deserialize::<Foo>(&bytes).unwrap();