Stop using serde(flatten) due to a bug in serde

see serde-rs/serde#1638
dkellner · Sep 18, 2020 · 8cae1ef · 8cae1ef
1 parent 76a53b8
commit 8cae1ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/offsetmap.rs b/src/offsetmap.rs
@@ -13,7 +13,6 @@ use std::collections::BTreeMap;
 #[derive(Clone, PartialEq, Eq, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub(crate) struct OffsetMap<K: Ord, O> {
-    #[cfg_attr(feature = "serde", serde(flatten))]
     map: BTreeMap<K, Option<O>>,
 }
 

diff --git a/src/rangemap.rs b/src/rangemap.rs
@@ -5,7 +5,6 @@ use std::collections::BTreeMap;
 #[derive(Clone, PartialEq, Eq, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub(crate) struct RangeFromMap<K: Ord, V> {
-    #[cfg_attr(feature = "serde", serde(flatten))]
     map: BTreeMap<K, V>,
 }
 

diff --git a/tests/serialization.rs b/tests/serialization.rs
@@ -1,10 +1,19 @@
 #![cfg(feature = "serde")]
 use chronofold::{Chronofold, LogIndex};
 
+#[test]
+fn roundtrip() {
+    let mut cfold = Chronofold::<usize, char>::new();
+    cfold.session(1).extend("Hello world!".chars());
+    let json = serde_json::to_string(&cfold).unwrap();
+    eprintln!("{}", json);
+    assert_eq!(cfold, serde_json::from_str(&json).unwrap());
+}
+
 #[test]
 fn empty() {
     let cfold = Chronofold::<usize, char>::new();
-    assert_json_max_len(&cfold, 100);
+    assert_json_max_len(&cfold, 132);
 }
 
 #[test]
@@ -14,7 +23,7 @@ fn local_edits_only() {
     cfold
         .session(1)
         .splice(LogIndex(6)..LogIndex(11), "cfold".chars());
-    assert_json_max_len(&cfold, 360);
+    assert_json_max_len(&cfold, 390);
 }
 
 fn assert_json_max_len(cfold: &Chronofold<usize, char>, max_len: usize) {