Merge 8f6978a into 450759d

vercel · Feb 21, 2023 · bdaf28b · bdaf28b
2 parents 450759d + 8f6978a
commit bdaf28b
Show file tree

Hide file tree

Showing 13 changed files with 854 additions and 381 deletions.
diff --git a/crates/turbo-tasks-memory/src/cell.rs b/crates/turbo-tasks-memory/src/cell.rs
@@ -11,6 +11,8 @@ use turbo_tasks::{
     TaskId, TurboTasksBackendApi,
 };
 
+use crate::MemoryBackend;
+
 #[derive(Default, Debug)]
 pub(crate) enum Cell {
     /// No content has been set yet, or it was removed for memory pressure
@@ -204,7 +206,11 @@ impl Cell {
         }
     }
 
-    pub fn assign(&mut self, content: CellContent, turbo_tasks: &dyn TurboTasksBackendApi) {
+    pub fn assign(
+        &mut self,
+        content: CellContent,
+        turbo_tasks: &dyn TurboTasksBackendApi<MemoryBackend>,
+    ) {
         match self {
             Cell::Empty => {
                 *self = Cell::Value {
@@ -287,7 +293,7 @@ impl Cell {
     }
 
     /// Drops the cell after GC. Will notify all dependent tasks and events.
-    pub fn gc_drop(self, turbo_tasks: &dyn TurboTasksBackendApi) {
+    pub fn gc_drop(self, turbo_tasks: &dyn TurboTasksBackendApi<MemoryBackend>) {
         match self {
             Cell::Empty => {}
             Cell::Recomputing {

diff --git a/crates/turbo-tasks-memory/src/gc.rs b/crates/turbo-tasks-memory/src/gc.rs
@@ -152,7 +152,7 @@ impl GcQueue {
         &self,
         factor: u8,
         backend: &MemoryBackend,
-        turbo_tasks: &dyn TurboTasksBackendApi,
+        turbo_tasks: &dyn TurboTasksBackendApi<MemoryBackend>,
     ) -> Option<(GcPriority, usize, GcStats)> {
         // Process through the inactive propagation queue.
         while let Ok(task) = self.inactive_propagate_queue.pop() {