Diff by ref (#25)

* update benches

* add generation of diffs by ref

* patch nanoserde version until new version released

* bump to latest nanoserde version

Author: knickish

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "structdiff"
-version = "0.5.9"
+version = "0.6.0"
 edition = "2021"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/knickish/structdiff"
@@ -9,12 +9,12 @@ keywords      = ["delta-compression", "difference"]
 categories    = ["compression"]
 
 [dependencies]
-nanoserde           = { version = "^0.1.32", optional = true }
+nanoserde           = { version = "^0.1.37", optional = true }
 serde               = { version = "^1.0.0", optional = true, features = ["derive"] }
-structdiff-derive   = { path = "derive", version = "=0.5.9" }
+structdiff-derive   = { path = "derive", version = "=0.6.0" }
 
 [features]
-"default"       = []
+"default"       = ["nanoserde"]
 "nanoserde"     = ["dep:nanoserde", "structdiff-derive/nanoserde"]
 "serde"         = ["dep:serde", "structdiff-derive/serde"]
 "debug_diffs"   = ["structdiff-derive/debug_diffs"]

benchmarks/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 assert_unordered    = "0.3.5"
-structdiff  = { path = "..", features = ["serde"] }
+structdiff  = { path = "..", features = ["serde", "debug_diffs"] }
 nanorand    = { version = "0.7.0" } 
 diff-struct = { version = "0.5.1", optional = true} 
 serde       = { version = "^1.0.0", features = ["derive"] }
@@ -16,6 +16,7 @@ bincode     = { version = "1.3.3" }
 criterion = "0.5.1"
 
 [features]
+default = ["compare"]
 compare = ["dep:serde-diff", "dep:diff-struct"]
 
 [profile.bench]

benchmarks/benches/basic.rs

@@ -15,32 +15,53 @@ const SEED: u64 = 42;
 #[cfg(feature = "compare")]
 criterion_group!(
     benches,
-    bench_basic,
+    bench_basic_generation,
+    bench_basic_full,
     diff_struct_bench::bench_basic,
     serde_diff_bench::bench_basic
 );
 #[cfg(not(feature = "compare"))]
-criterion_group!(benches, bench_basic);
+criterion_group!(benches, bench_basic_generation, bench_basic_full);
 
 criterion_main!(benches);
 
-fn bench_basic(c: &mut Criterion) {
+fn bench_basic_generation(c: &mut Criterion) {
+    const GROUP_NAME: &str = "bench_basic";
+    let mut rng = WyRand::new_seed(SEED);
+    let first = black_box(TestBench::generate_random(&mut rng));
+    let second = black_box(TestBench::generate_random(&mut rng));
+    let mut group = c.benchmark_group(GROUP_NAME);
+    group
+        .sample_size(SAMPLE_SIZE)
+        .measurement_time(MEASUREMENT_TIME);
+    group.bench_function(GROUP_NAME, |b| {
+        b.iter(|| {
+            let diff = black_box(StructDiff::diff_ref(&first, &second));
+            black_box(diff);
+        })       
+    });
+    group.finish();
+}
+
+fn bench_basic_full(c: &mut Criterion) {
     const GROUP_NAME: &str = "bench_basic";
     let mut rng = WyRand::new_seed(SEED);
     let mut first = black_box(TestBench::generate_random(&mut rng));
+    
     let second = black_box(TestBench::generate_random(&mut rng));
+    let mut diff: Vec<<TestBench as StructDiff>::Diff> = Vec::new();
     let mut group = c.benchmark_group(GROUP_NAME);
     group
         .sample_size(SAMPLE_SIZE)
         .measurement_time(MEASUREMENT_TIME);
     group.bench_function(GROUP_NAME, |b| {
         b.iter(|| {
-            let diff = black_box(StructDiff::diff(&first, &second));
-            black_box(first.apply_mut(diff));
-        })
+            diff = black_box(StructDiff::diff(&first, &second));
+            black_box(first.apply_mut(diff.clone()));
+        })       
     });
     group.finish();
-    first.assert_eq(second);
+    first.assert_eq(second, &diff);
 }
 
 #[cfg(feature = "compare")]

benchmarks/benches/large.rs

@@ -15,16 +15,35 @@ const SEED: u64 = 42;
 #[cfg(feature = "compare")]
 criterion_group!(
     benches,
-    bench_large,
+    bench_large_generation,
+    bench_large_full,
     diff_struct_bench::bench_large,
     serde_diff_bench::bench_large
 );
 #[cfg(not(feature = "compare"))]
-criterion_group!(benches, bench_large);
+criterion_group!(benches, bench_large_generation, bench_large_full);
 
 criterion_main!(benches);
 
-fn bench_large(c: &mut Criterion) {
+fn bench_large_generation(c: &mut Criterion) {
+    const GROUP_NAME: &str = "bench_large";
+    let mut rng = WyRand::new_seed(SEED);
+    let first = black_box(TestBench::generate_random_large(&mut rng));
+    let second = black_box(TestBench::generate_random_large(&mut rng));
+    let mut group = c.benchmark_group(GROUP_NAME);
+    group
+        .sample_size(SAMPLE_SIZE)
+        .measurement_time(MEASUREMENT_TIME);
+    group.bench_function(GROUP_NAME, |b| {
+        b.iter(|| {
+            let diff = black_box(StructDiff::diff_ref(&first, &second));
+            black_box(diff);
+        })
+    });
+    group.finish();
+}
+
+fn bench_large_full(c: &mut Criterion) {
     const GROUP_NAME: &str = "bench_large";
     let mut rng = WyRand::new_seed(SEED);
     let mut first = black_box(TestBench::generate_random_large(&mut rng));

benchmarks/src/lib.rs

@@ -87,16 +87,19 @@ impl TestBench {
         }
     }
 
-    pub fn assert_eq(self, right: TestBench) {
-        assert_eq!(self.a, right.a);
-        assert_eq!(self.b, right.b);
-        assert_eq_unordered_sort!(self.c, right.c);
-        assert_eq_unordered_sort!(self.d, right.d);
+    #[track_caller]
+    pub fn assert_eq(self, right: TestBench, diff: &Vec<<TestBench as StructDiff>::Diff>) {
+        assert_eq!(self.a, right.a, "{:?}", diff);
+        assert_eq!(self.b, right.b, "{:?}", diff);
+        assert_eq_unordered_sort!(self.c, right.c, "{:?}", diff);
+        assert_eq_unordered_sort!(self.d, right.d, "{:?}", diff);
         assert_eq_unordered_sort!(
             self.e.iter().map(|x| x.0).collect::<Vec<_>>(),
-            right.e.iter().map(|x| x.0).collect::<Vec<_>>()
+            right.e.iter().map(|x| x.0).collect::<Vec<_>>(), 
+            "{:?}", 
+            diff
         );
-        assert_eq_unordered_sort!(self.f, right.f);
+        assert_eq_unordered_sort!(self.f, right.f, "{:?}", diff);
     }
 }
 

derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "structdiff-derive"
-version = "0.5.9"
+version = "0.6.0"
 authors = ["Makepad <[email protected]>", "Fedor <[email protected]>", "Kirk <[email protected]"]
 edition = "2018"
 description = "derive macro library for structdiff"
@@ -10,7 +10,7 @@ license = "MIT"
 proc-macro = true
 
 [dependencies]
-nanoserde           = { version = "^0.1.32", optional = true }
+nanoserde           = { version = "^0.1.37", optional = true }
 serde               = { version = "^1.0.0", optional = true, features = ["derive"] }
 
 [features]