rebase fixes

vercel · Aug 15, 2024 · 2979bef · 2979bef
1 parent 4c2cbf0
commit 2979bef
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs b/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
@@ -97,11 +97,8 @@ impl Default for TurboTasksBackend {
 impl TurboTasksBackend {
     pub fn new() -> Self {
         Self {
-            persisted_task_id_factory: IdFactoryWithReuse::new_with_range(
-                1,
-                (TRANSIENT_TASK_BIT - 1) as u64,
-            ),
-            transient_task_id_factory: IdFactoryWithReuse::new_with_range(
+            persisted_task_id_factory: IdFactoryWithReuse::new(1, (TRANSIENT_TASK_BIT - 1) as u64),
+            transient_task_id_factory: IdFactoryWithReuse::new(
                 TRANSIENT_TASK_BIT as u64,
                 u32::MAX as u64,
             ),
@@ -521,8 +518,14 @@ impl Backend for TurboTasksBackend {
                             else {
                                 unreachable!()
                             };
-                            CachedTaskType::run_resolve_native(*fn_type, *this, &**arg, turbo_tasks)
-                                .await
+                            CachedTaskType::run_resolve_native(
+                                *fn_type,
+                                *this,
+                                &**arg,
+                                task_id.is_transient(),
+                                turbo_tasks,
+                            )
+                            .await
                         }) as Pin<Box<dyn Future<Output = _> + Send + '_>>,
                     )
                 }
@@ -550,6 +553,7 @@ impl Backend for TurboTasksBackend {
                                 method_name.clone(),
                                 *this,
                                 &**arg,
+                                task_id.is_transient(),
                                 turbo_tasks,
                             )
                             .await

diff --git a/turbopack/crates/turbo-tasks-backend/src/backend/operation/mod.rs b/turbopack/crates/turbo-tasks-backend/src/backend/operation/mod.rs
@@ -203,6 +203,10 @@ impl<'a> TaskGuard<'a> {
         self.task.get(key)
     }
 
+    pub fn has_key(&self, key: &CachedDataItemKey) -> bool {
+        self.task.has_key(key)
+    }
+
     pub fn iter(&self) -> impl Iterator<Item = (&CachedDataItemKey, &CachedDataItemValue)> {
         self.task.iter()
     }

diff --git a/turbopack/crates/turbo-tasks-backend/src/backend/storage.rs b/turbopack/crates/turbo-tasks-backend/src/backend/storage.rs
@@ -46,6 +46,10 @@ impl<T: KeyValuePair> InnerStorage<T> {
         self.map.get(key)
     }
 
+    pub fn has_key(&self, key: &T::Key) -> bool {
+        self.map.contains_key(key)
+    }
+
     pub fn iter(&self) -> impl Iterator<Item = (&T::Key, &T::Value)> {
         self.map.iter()
     }

diff --git a/turbopack/crates/turbo-tasks-backend/src/data.rs b/turbopack/crates/turbo-tasks-backend/src/data.rs
@@ -1,6 +1,7 @@
+use serde::{Deserialize, Serialize};
 use turbo_tasks::{event::Event, util::SharedError, CellId, KeyValuePair, SharedReference, TaskId};
 
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CellRef {
     pub task: TaskId,
     pub cell: CellId,