Unverified Commit d7de6f10 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

Turbopack: Remove the IntoTraitRef trait, make it an inherent method on Vc (#91223)

This is basically one-shot from Opus 4.6, with a minor tweak to the doc comment by hand.

Discussed this with @lukesandberg, and we realized that there's only one implementation of this trait, so it doesn't make a ton of sense as a trait.
parent 75038781
...@@ -33,8 +33,8 @@ use serde::{Deserialize, Serialize}; ...@@ -33,8 +33,8 @@ use serde::{Deserialize, Serialize};
use tracing::{Instrument, field::Empty}; use tracing::{Instrument, field::Empty};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
Completion, Completions, FxIndexMap, IntoTraitRef, NonLocalValue, OperationValue, OperationVc, Completion, Completions, FxIndexMap, NonLocalValue, OperationValue, OperationVc, ReadRef,
ReadRef, ResolvedVc, State, TaskInput, TransientInstance, TryFlatJoinIterExt, Vc, ResolvedVc, State, TaskInput, TransientInstance, TryFlatJoinIterExt, Vc,
debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs,
}; };
use turbo_tasks_env::{EnvMap, ProcessEnv}; use turbo_tasks_env::{EnvMap, ProcessEnv};
......
...@@ -3,7 +3,7 @@ use std::{io::Write, iter::once}; ...@@ -3,7 +3,7 @@ use std::{io::Write, iter::once};
use anyhow::{Context, Result, bail}; use anyhow::{Context, Result, bail};
use indoc::writedoc; use indoc::writedoc;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{IntoTraitRef, ResolvedVc, ValueToString, Vc}; use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileContent}; use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, asset::AssetContent,
......
...@@ -6,7 +6,7 @@ use std::{collections::HashSet, mem::take, sync::Mutex}; ...@@ -6,7 +6,7 @@ use std::{collections::HashSet, mem::take, sync::Mutex};
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{ use turbo_tasks::{
IntoTraitRef, Invalidator, TraitRef, Vc, get_invalidator, Invalidator, TraitRef, Vc, get_invalidator,
unmark_top_level_task_may_leak_eventually_consistent_state, with_turbo_tasks, unmark_top_level_task_may_leak_eventually_consistent_state, with_turbo_tasks,
}; };
use turbo_tasks_testing::{Registration, register, run_once}; use turbo_tasks_testing::{Registration, register, run_once};
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{ use turbo_tasks::{
IntoTraitRef, State, TraitRef, Upcast, Vc, State, TraitRef, Upcast, Vc, unmark_top_level_task_may_leak_eventually_consistent_state,
unmark_top_level_task_may_leak_eventually_consistent_state,
}; };
use turbo_tasks_testing::{Registration, register, run_once}; use turbo_tasks_testing::{Registration, register, run_once};
......
...@@ -108,7 +108,7 @@ pub use crate::{ ...@@ -108,7 +108,7 @@ pub use crate::{
task_input::{EitherTaskInput, TaskInput}, task_input::{EitherTaskInput, TaskInput},
}, },
task_execution_reason::TaskExecutionReason, task_execution_reason::TaskExecutionReason,
trait_ref::{IntoTraitRef, TraitRef}, trait_ref::TraitRef,
value::{TransientInstance, TransientValue}, value::{TransientInstance, TransientValue},
value_type::{TraitMethod, TraitType, ValueType}, value_type::{TraitMethod, TraitType, ValueType},
vc::{ vc::{
......
use std::{fmt::Debug, future::Future, marker::PhantomData}; use std::{fmt::Debug, marker::PhantomData};
use anyhow::Result;
use crate::{ use crate::{
Vc, VcValueTrait, Vc, VcValueTrait, registry::get_value_type, task::shared_reference::TypedSharedReference,
registry::get_value_type,
task::shared_reference::TypedSharedReference,
vc::{ReadVcFuture, VcValueTraitCast, cast::VcCast},
}; };
/// Similar to a [`ReadRef<T>`][crate::ReadRef], but contains a value trait object instead. /// Similar to a [`ReadRef<T>`][crate::ReadRef], but contains a value trait object instead.
...@@ -117,31 +112,3 @@ where ...@@ -117,31 +112,3 @@ where
(value_type.raw_cell)(shared_reference).into() (value_type.raw_cell)(shared_reference).into()
} }
} }
/// A trait that allows a value trait vc to be converted into a trait reference.
///
/// The signature is similar to `IntoFuture`, but we don't want trait vcs to
/// have the same future-like semantics as value vcs when it comes to producing
/// refs. This behavior is rarely needed, so in most cases, `.await`ing a trait
/// vc is a mistake.
pub trait IntoTraitRef {
type ValueTrait: VcValueTrait + ?Sized;
type Future: Future<Output = Result<<VcValueTraitCast<Self::ValueTrait> as VcCast>::Output>>;
fn into_trait_ref(self) -> Self::Future;
}
impl<T> IntoTraitRef for Vc<T>
where
T: VcValueTrait + ?Sized,
{
type ValueTrait = T;
type Future = ReadVcFuture<T, VcValueTraitCast<T>>;
fn into_trait_ref(self) -> Self::Future {
self.node
.into_read_with_unknown_is_serializable_cell_content()
.into()
}
}
...@@ -514,6 +514,22 @@ where ...@@ -514,6 +514,22 @@ where
impl<T> Unpin for Vc<T> where T: ?Sized {} impl<T> Unpin for Vc<T> where T: ?Sized {}
impl<T> Vc<T>
where
T: VcValueTrait + ?Sized,
{
/// Converts this trait vc into a trait reference.
///
/// The signature is similar to [`IntoFuture::into_future`], but we don't want trait vcs to
/// have the same future-like semantics as value vcs when it comes to producing refs. This
/// behavior is rarely needed, so in most cases, `.await`ing a trait vc is a mistake.
pub fn into_trait_ref(self) -> ReadVcFuture<T, VcValueTraitCast<T>> {
self.node
.into_read_with_unknown_is_serializable_cell_content()
.into()
}
}
impl<T> Default for Vc<T> impl<T> Default for Vc<T>
where where
T: ValueDefault, T: ValueDefault,
......
...@@ -7,9 +7,8 @@ use serde::{Deserialize, Serialize}; ...@@ -7,9 +7,8 @@ use serde::{Deserialize, Serialize};
pub use turbo_tasks_macros::OperationValue; pub use turbo_tasks_macros::OperationValue;
use crate::{ use crate::{
CollectiblesSource, IntoTraitRef, RawVc, ReadVcFuture, ResolvedVc, TaskInput, UpcastStrict, Vc, CollectiblesSource, RawVc, ReadVcFuture, ResolvedVc, TaskInput, UpcastStrict, Vc, VcValueTrait,
VcValueTrait, VcValueTraitCast, VcValueType, marker_trait::impl_auto_marker_trait, VcValueTraitCast, VcValueType, marker_trait::impl_auto_marker_trait, trace::TraceRawVcs,
trace::TraceRawVcs,
}; };
/// A "subtype" (can be converted via [`.connect()`]) of [`Vc`] that /// A "subtype" (can be converted via [`.connect()`]) of [`Vc`] that
......
...@@ -114,8 +114,6 @@ pub unsafe trait VcValueType: ShrinkToFit + Sized + Send + Sync + 'static { ...@@ -114,8 +114,6 @@ pub unsafe trait VcValueType: ShrinkToFit + Sized + Send + Sync + 'static {
/// functions defined on the trait to be called. /// functions defined on the trait to be called.
/// ///
/// ```ignore /// ```ignore
/// use turbo_tasks::IntoTraitRef;
///
/// let trait_vc: Vc<Box<dyn MyTrait>> = ...; /// let trait_vc: Vc<Box<dyn MyTrait>> = ...;
/// let trait_ref: TraitRef<Box<dyn MyTrait>> = trait_vc.into_trait_ref().await?; /// let trait_ref: TraitRef<Box<dyn MyTrait>> = trait_vc.into_trait_ref().await?;
/// ///
......
...@@ -6,9 +6,7 @@ use either::Either; ...@@ -6,9 +6,7 @@ use either::Either;
use indoc::writedoc; use indoc::writedoc;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, TryJoinIterExt, Vc, trace::TraceRawVcs};
FxIndexMap, IntoTraitRef, NonLocalValue, ResolvedVc, TryJoinIterExt, Vc, trace::TraceRawVcs,
};
use turbo_tasks_fs::{File, FileContent}; use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
...@@ -2,7 +2,7 @@ use std::sync::Arc; ...@@ -2,7 +2,7 @@ use std::sync::Arc;
use anyhow::Result; use anyhow::Result;
use serde::Serialize; use serde::Serialize;
use turbo_tasks::{FxIndexMap, IntoTraitRef, ResolvedVc, TraitRef, Vc}; use turbo_tasks::{FxIndexMap, ResolvedVc, TraitRef, Vc};
use turbopack_core::version::{ use turbopack_core::version::{
MergeableVersionedContent, PartialUpdate, TotalUpdate, Update, Version, VersionedContent, MergeableVersionedContent, PartialUpdate, TotalUpdate, Update, Version, VersionedContent,
VersionedContentMerger, VersionedContentMerger,
......
...@@ -2,7 +2,7 @@ use std::sync::Arc; ...@@ -2,7 +2,7 @@ use std::sync::Arc;
use anyhow::Result; use anyhow::Result;
use serde::Serialize; use serde::Serialize;
use turbo_tasks::{FxIndexMap, FxIndexSet, IntoTraitRef, ReadRef, ResolvedVc, TryJoinIterExt, Vc}; use turbo_tasks::{FxIndexMap, FxIndexSet, ReadRef, ResolvedVc, TryJoinIterExt, Vc};
use turbo_tasks_fs::rope::Rope; use turbo_tasks_fs::rope::Rope;
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkingContext, ModuleId}, chunk::{ChunkingContext, ModuleId},
......
...@@ -15,9 +15,9 @@ use serde::{Deserialize, Serialize}; ...@@ -15,9 +15,9 @@ use serde::{Deserialize, Serialize};
use turbo_esregex::EsRegex; use turbo_esregex::EsRegex;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
CollectiblesSource, IntoTraitRef, NonLocalValue, OperationVc, RawVc, ReadRef, ResolvedVc, CollectiblesSource, NonLocalValue, OperationVc, RawVc, ReadRef, ResolvedVc, TaskInput,
TaskInput, TransientValue, TryFlatJoinIterExt, TryJoinIterExt, Upcast, ValueDefault, TransientValue, TryFlatJoinIterExt, TryJoinIterExt, Upcast, ValueDefault, ValueToString, Vc,
ValueToString, Vc, emit, trace::TraceRawVcs, emit, trace::TraceRawVcs,
}; };
use turbo_tasks_fs::{ use turbo_tasks_fs::{
FileContent, FileLine, FileLinesContent, FileSystem, FileSystemPath, glob::Glob, FileContent, FileLine, FileLinesContent, FileSystem, FileSystemPath, glob::Glob,
......
use anyhow::Result; use anyhow::Result;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{IntoTraitRef, PrettyPrintError, ResolvedVc, Vc}; use turbo_tasks::{PrettyPrintError, ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use crate::{ use crate::{
......
...@@ -3,7 +3,7 @@ use std::sync::Arc; ...@@ -3,7 +3,7 @@ use std::sync::Arc;
use anyhow::{Context, Result, bail}; use anyhow::{Context, Result, bail};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
IntoTraitRef, NonLocalValue, OperationValue, ReadRef, ResolvedVc, State, TraitRef, Vc, NonLocalValue, OperationValue, ReadRef, ResolvedVc, State, TraitRef, Vc,
debug::ValueDebugFormat, trace::TraceRawVcs, debug::ValueDebugFormat, trace::TraceRawVcs,
}; };
use turbo_tasks_hash::HashAlgorithm; use turbo_tasks_hash::HashAlgorithm;
......
use anyhow::Result; use anyhow::Result;
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, TryJoinIterExt, Vc, turbofmt}; use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc, turbofmt};
use turbo_tasks_fs::{FileContent, FileSystemPath}; use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, MinifyType}, chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, MinifyType},
......
...@@ -4,7 +4,7 @@ use anyhow::{Context, Result}; ...@@ -4,7 +4,7 @@ use anyhow::{Context, Result};
use lightningcss::css_modules::CssModuleReference; use lightningcss::css_modules::CssModuleReference;
use swc_core::common::{BytePos, FileName, LineCol, SourceMap}; use swc_core::common::{BytePos, FileName, LineCol, SourceMap};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexMap, IntoTraitRef, ResolvedVc, Vc, turbofmt}; use turbo_tasks::{FxIndexMap, ResolvedVc, Vc, turbofmt};
use turbo_tasks_fs::{FileSystemPath, rope::Rope}; use turbo_tasks_fs::{FileSystemPath, rope::Rope};
use turbopack_core::{ use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt}, chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
......
...@@ -7,8 +7,7 @@ use tokio_stream::wrappers::ReceiverStream; ...@@ -7,8 +7,7 @@ use tokio_stream::wrappers::ReceiverStream;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
IntoTraitRef, NonLocalValue, OperationVc, PrettyPrintError, ReadRef, ResolvedVc, NonLocalValue, OperationVc, PrettyPrintError, ReadRef, ResolvedVc, TransientInstance, Vc,
TransientInstance, Vc,
trace::{TraceRawVcs, TraceRawVcsContext}, trace::{TraceRawVcs, TraceRawVcsContext},
}; };
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
......
...@@ -78,8 +78,8 @@ use swc_core::{ ...@@ -78,8 +78,8 @@ use swc_core::{
use tracing::{Instrument, Level, instrument}; use tracing::{Instrument, Level, instrument};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxDashMap, FxIndexMap, IntoTraitRef, NonLocalValue, ReadRef, ResolvedVc, TaskInput, FxDashMap, FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, Upcast,
TryJoinIterExt, Upcast, ValueToString, Vc, trace::TraceRawVcs, turbofmt, ValueToString, Vc, trace::TraceRawVcs, turbofmt,
}; };
use turbo_tasks_fs::{FileJsonContent, FileSystemPath, glob::Glob, rope::Rope}; use turbo_tasks_fs::{FileJsonContent, FileSystemPath, glob::Glob, rope::Rope};
use turbopack_core::{ use turbopack_core::{
......
...@@ -10,8 +10,8 @@ use serde::{Deserialize, Serialize, de::DeserializeOwned}; ...@@ -10,8 +10,8 @@ use serde::{Deserialize, Serialize, de::DeserializeOwned};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
Completion, Effects, FxIndexMap, IntoTraitRef, NonLocalValue, OperationVc, PrettyPrintError, Completion, Effects, FxIndexMap, NonLocalValue, OperationVc, PrettyPrintError, ReadRef,
ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, Vc, duration_span, fxindexmap, get_effects, ResolvedVc, TaskInput, TryJoinIterExt, Vc, duration_span, fxindexmap, get_effects,
trace::TraceRawVcs, trace::TraceRawVcs,
}; };
use turbo_tasks_env::{EnvMap, ProcessEnv}; use turbo_tasks_env::{EnvMap, ProcessEnv};
......
...@@ -2,7 +2,7 @@ use std::sync::Arc; ...@@ -2,7 +2,7 @@ use std::sync::Arc;
use anyhow::Result; use anyhow::Result;
use serde::Serialize; use serde::Serialize;
use turbo_tasks::{FxIndexMap, FxIndexSet, IntoTraitRef, ReadRef, ResolvedVc, Vc}; use turbo_tasks::{FxIndexMap, FxIndexSet, ReadRef, ResolvedVc, Vc};
use turbo_tasks_fs::rope::Rope; use turbo_tasks_fs::rope::Rope;
use turbopack_core::{ use turbopack_core::{
chunk::ModuleId, chunk::ModuleId,
......
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, Vc, fxindexmap}; use turbo_tasks::{ResolvedVc, Vc, fxindexmap};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
......
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, Vc}; use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{ use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext}, chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext},
context::AssetContext, context::AssetContext,
......
...@@ -11,7 +11,7 @@ pub use module_options_context::*; ...@@ -11,7 +11,7 @@ pub use module_options_context::*;
pub use module_rule::*; pub use module_rule::*;
pub use rule_condition::*; pub use rule_condition::*;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{IntoTraitRef, ResolvedVc, TryJoinIterExt, Vc}; use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
FileSystemPath, FileSystemPath,
glob::{Glob, GlobOptions}, glob::{Glob, GlobOptions},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment