Implement GcErase + GcRebrand for indexmap

Author: Techcable

src/manually_traced/indexmap.rs

@@ -36,14 +36,25 @@ unsafe impl<K, V> GcSafe for IndexMap<K, V> where
     K: GcSafe + TraceImmutable + Eq + Hash, V: GcSafe {
     const NEEDS_DROP: bool = true; // IndexMap has internal memory
 }
-unsafe impl<'new_gc, Id, K, V> GcBrand<'new_gc, Id> for IndexMap<K, V>
-    where Id: CollectorId, K: TraceImmutable + Eq + Hash + GcBrand<'new_gc, Id>,
-          V: GcBrand<'new_gc, Id>,
-          <K as GcBrand<'new_gc, Id>>::Branded: TraceImmutable + Eq + Hash + Sized,
-          <V as GcBrand<'new_gc, Id>>::Branded: Sized {
+unsafe impl<'new_gc, Id, K, V> GcRebrand<'new_gc, Id> for IndexMap<K, V>
+    where Id: CollectorId, K: TraceImmutable + Eq + Hash + GcRebrand<'new_gc, Id>,
+          V: GcRebrand<'new_gc, Id>,
+          <K as GcRebrand<'new_gc, Id>>::Branded: TraceImmutable + Eq + Hash + Sized,
+          <V as GcRebrand<'new_gc, Id>>::Branded: Sized {
     type Branded = IndexMap<
-        <K as GcBrand<'new_gc, Id>>::Branded,
-        <V as GcBrand<'new_gc, Id>>::Branded
+        <K as GcRebrand<'new_gc, Id>>::Branded,
+        <V as GcRebrand<'new_gc, Id>>::Branded
+    >;
+}
+
+unsafe impl<'a, Id, K, V> GcErase<'a, Id> for IndexMap<K, V>
+    where Id: CollectorId, K: TraceImmutable + Eq + Hash + GcErase<'a, Id>,
+          V: GcErase<'a, Id>,
+          <K as GcErase<'a, Id>>::Erased: TraceImmutable + Eq + Hash + Sized,
+          <V as GcErase<'a, Id>>::Erased: Sized {
+    type Erased = IndexMap<
+        <K as GcErase<'a, Id>>::Erased,
+        <V as GcErase<'a, Id>>::Erased
     >;
 }
 
@@ -70,8 +81,13 @@ unsafe impl<V> Trace for IndexSet<V>
         Ok(())
     }
 }
-unsafe impl<'new_gc, Id, V> GcBrand<'new_gc, Id> for IndexSet<V>
-    where Id: CollectorId, V: GcBrand<'new_gc, Id> + TraceImmutable + Eq + Hash,
-          <V as GcBrand<'new_gc, Id>>::Branded: TraceImmutable + Eq + Hash, {
-    type Branded = IndexSet<<V as GcBrand<'new_gc, Id>>::Branded>;
+unsafe impl<'new_gc, Id, V> GcRebrand<'new_gc, Id> for IndexSet<V>
+    where Id: CollectorId, V: GcRebrand<'new_gc, Id> + TraceImmutable + Eq + Hash,
+          <V as GcRebrand<'new_gc, Id>>::Branded: TraceImmutable + Eq + Hash, {
+    type Branded = IndexSet<<V as GcRebrand<'new_gc, Id>>::Branded>;
+}
+unsafe impl<'a, Id, V> GcErase<'a, Id> for IndexSet<V>
+    where Id: CollectorId, V: GcErase<'a, Id> + TraceImmutable + Eq + Hash,
+          <V as GcErase<'a, Id>>::Erased: TraceImmutable + Eq + Hash, {
+    type Erased = IndexSet<<V as GcErase<'a, Id>>::Erased>;
 }