Update to nightly 2022-02-08

Specify more explicit types to workaround GAT inference problems

Author: Techcable

libs/context/src/collector.rs

@@ -387,7 +387,7 @@ unsafe impl<C> GcSimpleAlloc for CollectorContext<C>
 
     #[inline]
     fn alloc_raw_vec_with_capacity<'gc, T>(&'gc self, capacity: usize) -> C::RawVec<'gc, T> where T: GcSafe<'gc, CollectorId<C>> {
-        C::alloc_raw_vec_with_capacity(self, capacity)
+        C::alloc_raw_vec_with_capacity::<T>(self, capacity)
     }
 }
 

libs/simple/src/layout.rs

@@ -334,7 +334,7 @@ unsafe impl<'gc, T: GcSafe<'gc, crate::CollectorId>> IGcVec<'gc, T> for SimpleVe
 
     #[inline]
     pub fn with_capacity_in(capacity: usize, ctx: &'gc crate::SimpleCollectorContext) -> Self {
-        ctx.alloc_raw_vec_with_capacity(capacity)
+        ctx.alloc_raw_vec_with_capacity::<T>(capacity)
     }
 
     #[inline]

libs/simple/tests/trait_objects.rs

@@ -1,4 +1,3 @@
-#![feature(thread_local_const_init)]
 use core::cell::Cell;
 
 use zerogc::{Trace, safepoint, DynTrace, trait_object_trace, GcSimpleAlloc};
@@ -73,4 +72,4 @@ fn foo_bar() {
     // Trace inner, should end up dropping Bar
     safepoint!(context, ());
     assert_eq!(BAR_DROP_COUNT.with(Cell::get), 2, "Expected Bar to be dropped");
-}
+}

src/epsilon/layout.rs

@@ -241,7 +241,7 @@ unsafe impl<'gc, T: GcSafe<'gc, EpsilonCollectorId>> IGcVec<'gc, T> for EpsilonR
 
     #[inline]
     pub fn with_capacity_in(capacity: usize, ctx: &'gc EpsilonContext) -> Self {
-        ctx.alloc_raw_vec_with_capacity(capacity)
+        ctx.alloc_raw_vec_with_capacity::<T>(capacity)
     }
 
     #[inline]
@@ -307,4 +307,4 @@ impl<'gc, T: GcSafe<'gc, EpsilonCollectorId>> Extend<T> for EpsilonRawVec<'gc, T
             self.push(val);
         }
     }
-}
+}

src/lib.rs

@@ -592,7 +592,7 @@ pub unsafe trait GcSimpleAlloc: GcContext {
     fn alloc_vec<'gc, T>(&'gc self) -> GcVec<'gc, T, Self::Id>
         where T: GcSafe<'gc, Self::Id> {
         unsafe {
-            crate::vec::GcVec::from_raw(self.alloc_raw_vec_with_capacity(0))
+            crate::vec::GcVec::from_raw(self.alloc_raw_vec_with_capacity::<T>(0))
         }
     }
     /// Allocate a new [GcVec] with the specified capacity
@@ -601,7 +601,7 @@ pub unsafe trait GcSimpleAlloc: GcContext {
     fn alloc_vec_with_capacity<'gc, T>(&'gc self, capacity: usize) -> GcVec<'gc, T, Self::Id>
         where T: GcSafe<'gc, Self::Id> {
         unsafe {
-            crate::vec::GcVec::from_raw(self.alloc_raw_vec_with_capacity(capacity))
+            crate::vec::GcVec::from_raw(self.alloc_raw_vec_with_capacity::<T>(capacity))
         }
     }
 }