Test implementations of GcDeserialize

Author: Techcable

Cargo.toml

@@ -23,6 +23,12 @@ zerogc-derive = { path = "libs/derive", version = "0.2.0-alpha.5" }
 # Used for the "epsilon" no-op collector
 bumpalo = { version = "3", optional = true }
 
+[dev-dependencies]
+serde_json = "1"
+# Used to test custom hash function
+# support for IndexMap
+fnv = "1"
+
 [workspace]
 members = ["libs/simple", "libs/derive", "libs/context"]
 

src/macros.rs

@@ -5,7 +5,6 @@
 /// ## Example
 /// ```
 /// # use zerogc::{Trace, DynTrace, trait_object_trace};
-/// # use zerogc_derive::Trace;
 /// # use zerogc::epsilon::{self, EpsilonCollectorId, Gc};
 /// # type OurSpecificId = EpsilonCollectorId;
 /// trait Foo<'gc>: DynTrace<'gc, OurSpecificId> {
@@ -113,4 +112,4 @@ macro_rules! impl_trace_for_nulltrace {
             }
         }
     }
-}
+}

src/manually_traced/indexmap.rs

@@ -12,7 +12,6 @@ unsafe_gc_impl! {
         TraceImmutable => { where K: TraceImmutable, V: TraceImmutable, S: 'static },
         TrustedDrop => { where K: TrustedDrop, V: TrustedDrop, S: 'static },
         GcSafe => { where K: GcSafe<'gc, Id>, V: GcSafe<'gc, Id>, S: 'static },
-        GcDeserialize => { where K: GcDeserialize<'gc, 'de, Id>, V: GcDeserialize<'gc, 'de, Id>, S: 'static }
     },
     null_trace => { where K: NullTrace, V: NullTrace },
     NEEDS_TRACE => K::NEEDS_TRACE || V::NEEDS_TRACE,
@@ -47,7 +46,6 @@ unsafe_gc_impl! {
         TraceImmutable => { where T: TraceImmutable, S: 'static },
         TrustedDrop => { where T: TrustedDrop, S: 'static },
         GcSafe => { where T: GcSafe<'gc, Id>, S: 'static },
-        GcDeserialize => { where K: GcDeserialize<'gc, 'de, Id>, V: GcDeserialize<'gc, 'de, Id>, S: 'static },
     },
     NEEDS_TRACE => T::NEEDS_TRACE,
     NEEDS_DROP => true, // Internal memory

src/serde.rs

@@ -272,3 +272,43 @@ impl_for_set!(HashSet<T, S> where T: TraceImmutable, S: 'static);
 impl_for_map!(IndexMap<K, V, S> where K: TraceImmutable, S: 'static);
 #[cfg(feature = "indexmap")]
 impl_for_set!(IndexSet<T, S> where T: TraceImmutable, S: 'static);
+
+#[cfg(test)]
+mod test {
+    use crate::epsilon::{EpsilonSystem, EpsilonCollectorId};
+    use super::*;
+    #[test]
+    #[cfg(feature = "indexmap")]
+    fn indexmap() {
+        let system = EpsilonSystem::leak();
+        let ctx = system.new_context();
+        const INPUT: &str = r##"{"foo": "bar", "eats": "turds"}"##;
+        let mut deser = serde_json::Deserializer::from_str(INPUT);
+        let s = |s: &'static str| String::from(s);
+        assert_eq!(
+            <IndexMap<String, Gc<String, EpsilonCollectorId>> as GcDeserialize<EpsilonCollectorId>>::deserialize_gc(&ctx, &mut deser).unwrap(),
+            indexmap::indexmap!(
+                s("foo") => ctx.alloc(s("bar")),
+                s("eats") => ctx.alloc(s("turds"))
+            )
+        );
+        let mut deser = serde_json::Deserializer::from_str(INPUT);
+        assert_eq!(
+            <IndexMap<String, Gc<String, EpsilonCollectorId>, fnv::FnvBuildHasher> as GcDeserialize<EpsilonCollectorId>>::deserialize_gc(&ctx, &mut deser).unwrap(),
+            indexmap::indexmap!(
+                s("foo") => ctx.alloc(s("bar")),
+                s("eats") => ctx.alloc(s("turds"))
+            )
+        );
+    }
+    #[test]
+    fn gc() {
+        let system = EpsilonSystem::leak();
+        let ctx = system.new_context();
+        let mut deser = serde_json::Deserializer::from_str(r#"128"#);
+        assert_eq!(
+            <Gc<i32, EpsilonCollectorId> as GcDeserialize<EpsilonCollectorId>>::deserialize_gc(&ctx, &mut deser).unwrap(),
+            ctx.alloc(128)
+        );
+    }
+}