For GcDeserialize, require Id: SimpleAllocCollectorId

Nessecarry for GcDeserialize for Gc.

Author: Techcable

libs/derive/src/derive.rs

@@ -447,6 +447,7 @@ impl TraceDeriveInput {
                     generics.make_where_clause().predicates.push(parse_quote!(#target: #requirement));
                 }
                 let ty_generics = self.generics.original.split_for_impl().1;
+                generics.make_where_clause().predicates.push(parse_quote!(#id: zerogc::SimpleAllocCollectorId));
                 let (impl_generics, _, where_clause) = generics.split_for_impl();
                 let target_type = &self.ident;
                 let forward_attrs = &self.attrs;
@@ -497,7 +498,7 @@ impl TraceDeriveInput {
                 };
                 let remote_name = target_type.to_token_stream().to_string();
                 let id_decl = if id_is_generic {
-                    Some(quote!(#id: zerogc::CollectorId,))
+                    Some(quote!(#id: zerogc::SimpleAllocCollectorId,))
                 } else { None };
                 Ok(quote! {
                     impl #impl_generics zerogc::serde::GcDeserialize<#gc_lt, 'deserialize, #id> for #target_type #ty_generics #where_clause {

src/serde.rs

@@ -105,7 +105,7 @@ macro_rules! impl_delegating_deserialize {
     (impl $(<$($lt:lifetime,)* $($param:ident),*>)? GcDeserialize<$gc:lifetime, $de:lifetime, $id:ident> for $target:path $(where $($where_clause:tt)*)?) => {
         impl$(<$($lt,)* $($param),*>)? $crate::serde::GcDeserialize<$gc, $de, $id> for $target
             where Self: Deserialize<$de> + $(, $($where_clause)*)?{
-            fn deserialize_gc<D: serde::Deserializer<$de>>(_ctx: <<$id as $crate::CollectorId>::System as $crate::GcSystem>::Context, deserializer: D) -> Result<Self, <D as serde::Deserializer<$de>>::Error> {
+            fn deserialize_gc<D: serde::Deserializer<$de>>(_ctx: &$gc <<$id as $crate::CollectorId>::System as $crate::GcSystem>::Context, deserializer: D) -> Result<Self, <D as serde::Deserializer<$de>>::Error> {
                 <Self as serde::Deserialize<$de>>::deserialize(deserializer)
             }
         }