rename and fixes

Author: sokra

turbopack/crates/turbo-tasks-fs/src/lib.rs

@@ -60,7 +60,7 @@ use tracing::Instrument;
 use turbo_rcstr::RcStr;
 use turbo_tasks::{
     debug::ValueDebugFormat, effect, mark_session_dependent, mark_stateful, trace::TraceRawVcs,
-    ApplyEffectContext, Completion, InvalidationReason, Invalidator, NonLocalValue, ReadRef,
+    ApplyEffectsContext, Completion, InvalidationReason, Invalidator, NonLocalValue, ReadRef,
     ResolvedVc, ValueToString, Vc,
 };
 use turbo_tasks_hash::{
@@ -402,7 +402,7 @@ impl DiskFileSystemInner {
     }
 
     async fn create_directory(self: &Arc<Self>, directory: &Path) -> Result<()> {
-        let already_created = ApplyEffectContext::with_or_insert_with(
+        let already_created = ApplyEffectsContext::with_or_insert_with(
             DiskFileSystemApplyContext::default,
             |fs_context| fs_context.created_directories.contains(directory),
         );
@@ -415,7 +415,7 @@ impl DiskFileSystemInner {
                     path = display(directory.display())
                 ))
                 .await?;
-            ApplyEffectContext::with(|fs_context: &mut DiskFileSystemApplyContext| {
+            ApplyEffectsContext::with(|fs_context: &mut DiskFileSystemApplyContext| {
                 fs_context
                     .created_directories
                     .insert(directory.to_path_buf())

turbopack/crates/turbo-tasks/src/effect.rs

@@ -5,6 +5,7 @@ use std::{
     mem::replace,
     panic,
     pin::Pin,
+    sync::Arc,
 };
 
 use anyhow::{anyhow, Result};
@@ -98,10 +99,10 @@ impl EffectInstance {
                     listener.await;
                 }
                 State::NotStarted(EffectInner { future }) => {
-                    let join_handle = tokio::spawn(
+                    let join_handle = tokio::spawn(ApplyEffectsContext::in_current_scope(
                         turbo_tasks_future_scope(turbo_tasks::turbo_tasks(), future)
                             .instrument(Span::current()),
-                    );
+                    ));
                     let result = match join_handle.await {
                         Ok(Err(err)) => Err(SharedError::new(err)),
                         Err(err) => {
@@ -279,15 +280,26 @@ impl Effects {
 
 task_local! {
     /// The context of the current effects application.
-    static APPLY_EFFECTS_CONTEXT: Mutex<ApplyEffectContext>;
+    static APPLY_EFFECTS_CONTEXT: Arc<Mutex<ApplyEffectsContext>>;
 }
 
 #[derive(Default)]
-pub struct ApplyEffectContext {
+pub struct ApplyEffectsContext {
     data: FxHashMap<TypeId, Box<dyn Any + Send + Sync>>,
 }
 
-impl ApplyEffectContext {
+impl ApplyEffectsContext {
+    fn in_current_scope<F: Future>(f: F) -> impl Future<Output = F::Output> {
+        let current = Self::current();
+        APPLY_EFFECTS_CONTEXT.scope(current, f)
+    }
+
+    fn current() -> Arc<Mutex<Self>> {
+        APPLY_EFFECTS_CONTEXT
+            .try_with(|mutex| mutex.clone())
+            .expect("No effect context found")
+    }
+
     fn with_context<T, F: FnOnce(&mut Self) -> T>(f: F) -> T {
         APPLY_EFFECTS_CONTEXT
             .try_with(|mutex| f(&mut mutex.lock()))

turbopack/crates/turbo-tasks/src/lib.rs

@@ -90,7 +90,7 @@ use auto_hash_map::AutoSet;
 pub use collectibles::CollectiblesSource;
 pub use completion::{Completion, Completions};
 pub use display::ValueToString;
-pub use effect::{apply_effects, effect, get_effects, ApplyEffectContext, Effects};
+pub use effect::{apply_effects, effect, get_effects, ApplyEffectsContext, Effects};
 pub use id::{
     ExecutionId, FunctionId, LocalTaskId, SessionId, TaskId, TraitTypeId, ValueTypeId,
     TRANSIENT_TASK_BIT,