Turbopack: Remove turbo_tasks::unit() (vercel/turborepo#5860)

This is no longer used here or in Next.js since #54898 and #54901 Closes WEB-1492
vercel · Sep 5, 2023 · ee15fc6 · ee15fc6
1 parent 91fa77b
commit ee15fc6
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 47 deletions.
diff --git a/crates/node-file-trace/src/lib.rs b/crates/node-file-trace/src/lib.rs
@@ -24,8 +24,8 @@ use serde::Deserialize;
 use serde::Serialize;
 use tokio::sync::mpsc::channel;
 use turbo_tasks::{
-    backend::Backend, unit, util::FormatDuration, TaskId, TransientInstance, TransientValue,
-    TurboTasks, TurboTasksBackendApi, UpdateInfo, Value, Vc,
+    backend::Backend, util::FormatDuration, TaskId, TransientInstance, TransientValue, TurboTasks,
+    TurboTasksBackendApi, UpdateInfo, Value, Vc,
 };
 use turbo_tasks_fs::{
     glob::Glob, DirectoryEntry, DiskFileSystem, FileSystem, FileSystemPath, ReadGlobResult,
@@ -518,7 +518,7 @@ async fn run<B: Backend + 'static, F: Future<Output = ()>>(
                 sender.send(output_iter.collect::<Vec<String>>()).await?;
                 drop(sender);
             }
-            Ok(unit())
+            Ok::<Vc<()>, _>(Default::default())
         })
     });
     finish(tt, task).await?;

diff --git a/crates/turbo-tasks-fs/examples/hash_directory.rs b/crates/turbo-tasks-fs/examples/hash_directory.rs
@@ -9,7 +9,7 @@ use std::{
 
 use anyhow::Result;
 use sha2::{Digest, Sha256};
-use turbo_tasks::{unit, util::FormatDuration, TurboTasks, UpdateInfo, Vc};
+use turbo_tasks::{util::FormatDuration, TurboTasks, UpdateInfo, Vc};
 use turbo_tasks_fs::{
     register, DirectoryContent, DirectoryEntry, DiskFileSystem, FileContent, FileSystem,
     FileSystemPath,
@@ -38,7 +38,7 @@ async fn main() -> Result<()> {
             let input = fs.root().join("demo".to_string());
             let dir_hash = hash_directory(input);
             print_hash(dir_hash).await?;
-            Ok(unit())
+            Ok::<Vc<()>, _>(Default::default())
         })
     });
     tt.wait_task_completion(task, true).await.unwrap();
@@ -57,7 +57,7 @@ async fn main() -> Result<()> {
 #[turbo_tasks::function]
 async fn print_hash(dir_hash: Vc<String>) -> Result<Vc<()>> {
     println!("DIR HASH: {}", dir_hash.await?.as_str());
-    Ok(unit())
+    Ok(Default::default())
 }
 
 async fn filename(path: Vc<FileSystemPath>) -> Result<String> {

diff --git a/crates/turbo-tasks-fs/examples/hash_glob.rs b/crates/turbo-tasks-fs/examples/hash_glob.rs
@@ -9,7 +9,7 @@ use std::{
 
 use anyhow::Result;
 use sha2::{Digest, Sha256};
-use turbo_tasks::{unit, util::FormatDuration, TurboTasks, UpdateInfo, Vc};
+use turbo_tasks::{util::FormatDuration, TurboTasks, UpdateInfo, Vc};
 use turbo_tasks_fs::{
     glob::Glob, register, DirectoryEntry, DiskFileSystem, FileContent, FileSystem, FileSystemPath,
     ReadGlobResult,
@@ -37,7 +37,7 @@ async fn main() -> Result<()> {
             let glob_result = input.read_glob(glob, true);
             let dir_hash = hash_glob_result(glob_result);
             print_hash(dir_hash).await?;
-            Ok(unit())
+            Ok::<Vc<()>, _>(Default::default())
         })
     });
     tt.wait_task_completion(task, true).await.unwrap();
@@ -61,7 +61,7 @@ pub fn empty_string() -> Vc<String> {
 #[turbo_tasks::function]
 async fn print_hash(dir_hash: Vc<String>) -> Result<Vc<()>> {
     println!("DIR HASH: {}", dir_hash.await?.as_str());
-    Ok(unit())
+    Ok(Default::default())
 }
 
 #[turbo_tasks::function]

diff --git a/crates/turbo-tasks-memory/benches/scope_stress.rs b/crates/turbo-tasks-memory/benches/scope_stress.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use criterion::{BenchmarkId, Criterion};
-use turbo_tasks::{unit, Completion, TryJoinIterExt, TurboTasks, Vc};
+use turbo_tasks::{Completion, TryJoinIterExt, TurboTasks, Vc};
 use turbo_tasks_memory::MemoryBackend;
 
 use super::register;
@@ -47,7 +47,7 @@ pub fn scope_stress(c: &mut Criterion) {
                                 async move {
                                     let task = tt.spawn_once_task(async move {
                                         rectangle(a, b).strongly_consistent().await?;
-                                        Ok(unit())
+                                        Ok::<Vc<()>, _>(Default::default())
                                     });
                                     tt.wait_task_completion(task, false).await
                                 }

diff --git a/crates/turbo-tasks-memory/benches/stress.rs b/crates/turbo-tasks-memory/benches/stress.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use criterion::{BenchmarkId, Criterion};
-use turbo_tasks::{unit, TryJoinIterExt, TurboTasks, Vc};
+use turbo_tasks::{TryJoinIterExt, TurboTasks, Vc};
 use turbo_tasks_memory::MemoryBackend;
 
 use super::register;
@@ -41,7 +41,7 @@ pub fn fibonacci(c: &mut Criterion) {
                         // size >= 1 => + fib(0) = 1
                         // size >= 2 => + fib(1) = 2
                         (0..size).map(|i| fib(i, i)).try_join().await?;
-                        Ok(unit())
+                        Ok::<Vc<()>, _>(Default::default())
                     });
                     tt.wait_task_completion(task, false).await.unwrap();
                     tt

diff --git a/crates/turbo-tasks/src/lib.rs b/crates/turbo-tasks/src/lib.rs
@@ -68,7 +68,6 @@ pub mod task;
 mod timed_future;
 pub mod trace;
 mod trait_ref;
-mod unit;
 pub mod util;
 mod value;
 mod value_type;
@@ -102,8 +101,6 @@ pub use task::{
 };
 pub use trait_ref::{IntoTraitRef, TraitRef};
 pub use turbo_tasks_macros::{function, value, value_impl, value_trait, TaskInput};
-#[allow(deprecated)]
-pub use unit::unit;
 pub use value::{TransientInstance, TransientValue, Value};
 pub use value_type::{TraitMethod, TraitType, ValueType};
 pub use vc::{

diff --git a/crates/turbo-tasks/src/unit.rs b/crates/turbo-tasks/src/unit.rs
diff --git a/crates/turbopack-cli/src/build/mod.rs b/crates/turbopack-cli/src/build/mod.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use anyhow::{bail, Context, Result};
-use turbo_tasks::{unit, TransientInstance, TryJoinIterExt, TurboTasks, Value, Vc};
+use turbo_tasks::{TransientInstance, TryJoinIterExt, TurboTasks, Value, Vc};
 use turbo_tasks_fs::FileSystem;
 use turbo_tasks_memory::MemoryBackend;
 use turbopack::ecmascript::EcmascriptModuleAsset;
@@ -105,7 +105,7 @@ impl TurbopackBuildBuilder {
     }
 
     pub async fn build(self) -> Result<()> {
-        let task = self.turbo_tasks.spawn_once_task(async move {
+        let task = self.turbo_tasks.spawn_once_task::<(), _>(async move {
             let build_result = build_internal(
                 self.project_dir.clone(),
                 self.root_dir,
@@ -142,7 +142,7 @@ impl TurbopackBuildBuilder {
             )
             .await?;
 
-            Ok(unit())
+            Ok(Default::default())
         });
 
         self.turbo_tasks.wait_task_completion(task, true).await?;
@@ -204,13 +204,11 @@ async fn build_internal(
         .map(|r| async move {
             Ok(match &*r.await? {
                 EntryRequest::Relative(p) => {
-                    Request::relative(Value::new(p.clone().into()), Vc::<String>::empty(), false)
+                    Request::relative(Value::new(p.clone().into()), Default::default(), false)
+                }
+                EntryRequest::Module(m, p) => {
+                    Request::module(m.clone(), Value::new(p.clone().into()), Default::default())
                 }
-                EntryRequest::Module(m, p) => Request::module(
-                    m.clone(),
-                    Value::new(p.clone().into()),
-                    Vc::<String>::empty(),
-                ),
             })
         })
         .try_join()
@@ -294,7 +292,7 @@ async fn build_internal(
         .try_join()
         .await?;
 
-    Ok(unit())
+    Ok(Default::default())
 }
 
 pub async fn build(args: &BuildArguments) -> Result<()> {

diff --git a/crates/turbopack-cli/src/dev/mod.rs b/crates/turbopack-cli/src/dev/mod.rs
@@ -268,13 +268,11 @@ async fn source(
         .iter()
         .map(|r| match r {
             EntryRequest::Relative(p) => {
-                Request::relative(Value::new(p.clone().into()), Vc::<String>::empty(), false)
+                Request::relative(Value::new(p.clone().into()), Default::default(), false)
+            }
+            EntryRequest::Module(m, p) => {
+                Request::module(m.clone(), Value::new(p.clone().into()), Default::default())
             }
-            EntryRequest::Module(m, p) => Request::module(
-                m.clone(),
-                Value::new(p.clone().into()),
-                Vc::<String>::empty(),
-            ),
         })
         .collect();
 
@@ -303,7 +301,7 @@ async fn source(
     let main_source = Vc::upcast(main_source);
     let source_maps = Vc::upcast(SourceMapContentSource::new(main_source));
     let source = Vc::upcast(PrefixedRouterContentSource::new(
-        Vc::<String>::empty(),
+        Default::default(),
         vec![
             ("__turbopack__".to_string(), introspect),
             ("__turbo_tasks__".to_string(), viz),

diff --git a/crates/turbopack/benches/node_file_trace.rs b/crates/turbopack/benches/node_file_trace.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, fs, path::PathBuf};
 
 use criterion::{Bencher, BenchmarkId, Criterion};
 use regex::Regex;
-use turbo_tasks::{unit, TurboTasks, Value, Vc};
+use turbo_tasks::{TurboTasks, Value, Vc};
 use turbo_tasks_fs::{DiskFileSystem, FileSystem, NullFileSystem};
 use turbo_tasks_memory::MemoryBackend;
 use turbopack::{
@@ -103,7 +103,7 @@ fn bench_emit(b: &mut Bencher, bench_input: &BenchInput) {
 
                 emit_with_completion(Vc::upcast(rebased), output_dir).await?;
 
-                Ok(unit())
+                Ok::<Vc<()>, _>(Default::default())
             });
             tt.wait_task_completion(task, true).await.unwrap();
         }

diff --git a/crates/turbopack/examples/turbopack.rs b/crates/turbopack/examples/turbopack.rs
@@ -9,9 +9,7 @@ use std::{
 
 use anyhow::Result;
 use tokio::{spawn, time::sleep};
-use turbo_tasks::{
-    unit, util::FormatDuration, TurboTasks, TurboTasksBackendApi, UpdateInfo, Value, Vc,
-};
+use turbo_tasks::{util::FormatDuration, TurboTasks, TurboTasksBackendApi, UpdateInfo, Value, Vc};
 use turbo_tasks_fs::{DiskFileSystem, FileSystem};
 use turbo_tasks_memory::{
     stats::{ReferenceType, Stats},
@@ -72,7 +70,7 @@ async fn main() -> Result<()> {
             let rebased = RebasedAsset::new(module, input, output);
             emit_with_completion(Vc::upcast(rebased), output).await?;
 
-            Ok(unit())
+            Ok::<Vc<()>, _>(Default::default())
         })
     });
     spawn({