Unverified Commit d8979118 authored by Luke Sandberg's avatar Luke Sandberg Committed by GitHub

[turbopack] Function pointers are copy (#94273)

Change the bound on our function pointers from `Clone` -> `Copy`

Its cleaner
parent 62467ee5
...@@ -82,7 +82,7 @@ where ...@@ -82,7 +82,7 @@ where
Inputs: TaskInputs, Inputs: TaskInputs,
{ {
fn functor(&self, _this: Option<RawVc>, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> { fn functor(&self, _this: Option<RawVc>, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> {
TaskFnInputFunction::functor(&self.task_fn, arg) TaskFnInputFunction::functor(self.task_fn, arg)
} }
} }
...@@ -118,7 +118,7 @@ where ...@@ -118,7 +118,7 @@ where
let Some(this) = this else { let Some(this) = this else {
panic!("Method needs a `self` argument"); panic!("Method needs a `self` argument");
}; };
TaskFnInputFunctionWithThis::functor(&self.task_fn, this, arg) TaskFnInputFunctionWithThis::functor(self.task_fn, this, arg)
} }
} }
...@@ -134,9 +134,9 @@ where ...@@ -134,9 +134,9 @@ where
#[doc(hidden)] #[doc(hidden)]
pub trait TaskFnInputFunction<Mode: TaskFnMode, Inputs: TaskInputs>: pub trait TaskFnInputFunction<Mode: TaskFnMode, Inputs: TaskInputs>:
Send + Sync + Clone + 'static Send + Sync + Copy + 'static
{ {
fn functor(&self, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture>; fn functor(self, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture>;
} }
#[doc(hidden)] #[doc(hidden)]
...@@ -144,9 +144,9 @@ pub trait TaskFnInputFunctionWithThis< ...@@ -144,9 +144,9 @@ pub trait TaskFnInputFunctionWithThis<
Mode: TaskFnMode, Mode: TaskFnMode,
This: Sync + Send + 'static, This: Sync + Send + 'static,
Inputs: TaskInputs, Inputs: TaskInputs,
>: Send + Sync + Clone + 'static >: Send + Sync + Copy + 'static
{ {
fn functor(&self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture>; fn functor(self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture>;
} }
pub trait TaskInputs: Send + Sync + 'static {} pub trait TaskInputs: Send + Sync + 'static {}
...@@ -202,15 +202,14 @@ macro_rules! task_fn_impl { ...@@ -202,15 +202,14 @@ macro_rules! task_fn_impl {
impl<F, Output, $($arg,)*> TaskFnInputFunction<FunctionMode, ($($arg,)*)> for F impl<F, Output, $($arg,)*> TaskFnInputFunction<FunctionMode, ($($arg,)*)> for F
where where
$($arg: TaskInput + 'static,)* $($arg: TaskInput + 'static,)*
F: Fn($($arg,)*) -> Output + Send + Sync + Clone + 'static, F: Fn($($arg,)*) -> Output + Send + Sync + Copy + 'static,
Output: TaskOutput + 'static, Output: TaskOutput + 'static,
{ {
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn functor(&self, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> { fn functor(self, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> {
let task_fn = self.clone();
let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?; let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?;
Ok(Box::pin(async move { Ok(Box::pin(async move {
(task_fn)($($arg,)*).try_into_raw_vc() (self)($($arg,)*).try_into_raw_vc()
})) }))
} }
} }
...@@ -218,16 +217,15 @@ macro_rules! task_fn_impl { ...@@ -218,16 +217,15 @@ macro_rules! task_fn_impl {
impl<F, Output, FutureOutput, $($arg,)*> TaskFnInputFunction<AsyncFunctionMode, ($($arg,)*)> for F impl<F, Output, FutureOutput, $($arg,)*> TaskFnInputFunction<AsyncFunctionMode, ($($arg,)*)> for F
where where
$($arg: TaskInput + 'static,)* $($arg: TaskInput + 'static,)*
F: Fn($($arg,)*) -> FutureOutput + Send + Sync + Clone + 'static, F: Fn($($arg,)*) -> FutureOutput + Send + Sync + Copy + 'static,
FutureOutput: Future<Output = Output> + Send + 'static, FutureOutput: Future<Output = Output> + Send + 'static,
Output: TaskOutput + 'static, Output: TaskOutput + 'static,
{ {
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn functor(&self, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> { fn functor(self, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> {
let task_fn = self.clone();
let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?; let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?;
Ok(Box::pin(async move { Ok(Box::pin(async move {
(task_fn)($($arg,)*).await.try_into_raw_vc() (self)($($arg,)*).await.try_into_raw_vc()
})) }))
} }
} }
...@@ -236,18 +234,17 @@ macro_rules! task_fn_impl { ...@@ -236,18 +234,17 @@ macro_rules! task_fn_impl {
where where
Recv: VcValueType, Recv: VcValueType,
$($arg: TaskInput + 'static,)* $($arg: TaskInput + 'static,)*
F: Fn(&Recv, $($arg,)*) -> Output + Send + Sync + Clone + 'static, F: Fn(&Recv, $($arg,)*) -> Output + Send + Sync + Copy + 'static,
Output: TaskOutput + 'static, Output: TaskOutput + 'static,
{ {
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn functor(&self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> { fn functor(self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> {
let task_fn = self.clone();
let recv = Vc::<Recv>::from(this); let recv = Vc::<Recv>::from(this);
let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?; let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?;
Ok(Box::pin(async move { Ok(Box::pin(async move {
let recv = recv.await?; let recv = recv.await?;
let recv = <Recv::Read as VcRead<Recv>>::target_to_value_ref(&*recv); let recv = <Recv::Read as VcRead<Recv>>::target_to_value_ref(&*recv);
(task_fn)(recv, $($arg,)*).try_into_raw_vc() (self)(recv, $($arg,)*).try_into_raw_vc()
})) }))
} }
} }
...@@ -256,16 +253,15 @@ macro_rules! task_fn_impl { ...@@ -256,16 +253,15 @@ macro_rules! task_fn_impl {
where where
Recv: Sync + Send + 'static, Recv: Sync + Send + 'static,
$($arg: TaskInput + 'static,)* $($arg: TaskInput + 'static,)*
F: Fn(Vc<Recv>, $($arg,)*) -> Output + Send + Sync + Clone + 'static, F: Fn(Vc<Recv>, $($arg,)*) -> Output + Send + Sync + Copy + 'static,
Output: TaskOutput + 'static, Output: TaskOutput + 'static,
{ {
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn functor(&self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> { fn functor(self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> {
let task_fn = self.clone();
let recv = Vc::<Recv>::from(this); let recv = Vc::<Recv>::from(this);
let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?; let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?;
Ok(Box::pin(async move { Ok(Box::pin(async move {
(task_fn)(recv, $($arg,)*).try_into_raw_vc() (self)(recv, $($arg,)*).try_into_raw_vc()
})) }))
} }
} }
...@@ -289,17 +285,16 @@ macro_rules! task_fn_impl { ...@@ -289,17 +285,16 @@ macro_rules! task_fn_impl {
where where
Recv: VcValueType, Recv: VcValueType,
$($arg: TaskInput + 'static,)* $($arg: TaskInput + 'static,)*
F: for<'a> $async_fn_trait<&'a Recv, $($arg,)*> + Clone + Send + Sync + 'static, F: for<'a> $async_fn_trait<&'a Recv, $($arg,)*> + Copy + Send + Sync + 'static,
{ {
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn functor(&self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> { fn functor(self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> {
let task_fn = self.clone();
let recv = Vc::<Recv>::from(this); let recv = Vc::<Recv>::from(this);
let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?; let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?;
Ok(Box::pin(async move { Ok(Box::pin(async move {
let recv = recv.await?; let recv = recv.await?;
let recv = <Recv::Read as VcRead<Recv>>::target_to_value_ref(&*recv); let recv = <Recv::Read as VcRead<Recv>>::target_to_value_ref(&*recv);
(task_fn)(recv, $($arg,)*).await.try_into_raw_vc() (self)(recv, $($arg,)*).await.try_into_raw_vc()
})) }))
} }
} }
...@@ -308,15 +303,14 @@ macro_rules! task_fn_impl { ...@@ -308,15 +303,14 @@ macro_rules! task_fn_impl {
where where
Recv: Sync + Send + 'static, Recv: Sync + Send + 'static,
$($arg: TaskInput + 'static,)* $($arg: TaskInput + 'static,)*
F: $async_fn_trait<Vc<Recv>, $($arg,)*> + Clone + Send + Sync + 'static, F: $async_fn_trait<Vc<Recv>, $($arg,)*> + Copy + Send + Sync + 'static,
{ {
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn functor(&self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> { fn functor(self, this: RawVc, arg: &dyn DynTaskInputs) -> Result<NativeTaskFuture> {
let task_fn = self.clone();
let recv = Vc::<Recv>::from(this); let recv = Vc::<Recv>::from(this);
let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?; let ($($arg,)*) = get_args::<($($arg,)*)>(arg)?;
Ok(Box::pin(async move { Ok(Box::pin(async move {
(task_fn)(recv, $($arg,)*).await.try_into_raw_vc() (self)(recv, $($arg,)*).await.try_into_raw_vc()
})) }))
} }
} }
......
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