clippy

vercel · Jul 16, 2024 · 8f0000c · 8f0000c
1 parent 426b648
commit 8f0000c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/crates/turbo-tasks/src/backend.rs b/crates/turbo-tasks/src/backend.rs
@@ -115,7 +115,7 @@ mod ser {
         },
         Borrowed {
             fn_type: FunctionId,
-            arg: &'a Box<dyn MagicAny>,
+            arg: &'a dyn MagicAny,
         },
     }
 
@@ -129,7 +129,7 @@ mod ser {
             };
             let mut state = serializer.serialize_seq(Some(2))?;
             state.serialize_element(&fn_type)?;
-            let arg = &***arg;
+            let arg = *arg;
             let arg = registry::get_function(*fn_type).arg_meta.as_serialize(arg);
             state.serialize_element(arg)?;
             state.end()
@@ -159,10 +159,7 @@ mod ser {
                     let arg = seq
                         .next_element_seed(seed)?
                         .ok_or_else(|| serde::de::Error::invalid_length(1, &self))?;
-                    Ok(FunctionAndArg::Owned {
-                        fn_type,
-                        arg: arg.into(),
-                    })
+                    Ok(FunctionAndArg::Owned { fn_type, arg })
                 }
             }
             deserializer.deserialize_seq(Visitor)
@@ -190,7 +187,7 @@ mod ser {
                     s.serialize_element::<u8>(&1)?;
                     s.serialize_element(&FunctionAndArg::Borrowed {
                         fn_type: *fn_type,
-                        arg: arg,
+                        arg,
                     })?;
                     s.serialize_element(this)?;
                     s.end()

diff --git a/crates/turbo-tasks/src/native_function.rs b/crates/turbo-tasks/src/native_function.rs
@@ -16,14 +16,18 @@ use crate::{
     RawVc, TaskInput,
 };
 
+type ResolveFunctor =
+    for<'a> fn(
+        &'a dyn MagicAny,
+    ) -> Pin<Box<dyn Future<Output = Result<Box<dyn MagicAny>>> + Send + 'a>>;
+
+type IsResolvedFunctor = fn(&dyn MagicAny) -> bool;
+
 pub struct ArgMeta {
     serializer: MagicAnySerializeSeed,
     deserializer: MagicAnyDeserializeSeed,
-    is_resolved: fn(&dyn MagicAny) -> bool,
-    resolve: for<'a> fn(
-        &'a dyn MagicAny,
-    )
-        -> Pin<Box<dyn Future<Output = Result<Box<dyn MagicAny>>> + Send + 'a>>,
+    is_resolved: IsResolvedFunctor,
+    resolve: ResolveFunctor,
 }
 
 impl ArgMeta {
@@ -142,7 +146,7 @@ impl NativeFunction {
     pub fn execute(&'static self, this: Option<RawVc>, arg: &dyn MagicAny) -> NativeTaskFuture {
         match (self.implementation).functor(this, arg) {
             Ok(functor) => functor,
-            Err(err) => Box::pin(async { Err(err.into()) }),
+            Err(err) => Box::pin(async { Err(err) }),
         }
     }