From fbb69329343c9985c26181e6297e6556c46d381d Mon Sep 17 00:00:00 2001
From: Matt Mastracci <matthew@mastracci.com>
Date: Thu, 29 Jun 2023 10:23:14 -0600
Subject: refactor(ops): op2 support for generics (#19636)

Implementation of generics for `#[op2]`, along with some refactoring to
improve the ergonomics of ops with generics parameters:

- The ops have generics on the struct rather than the associated
methods, which allows us to trait-ify ops (impossible when they are on
the methods)
- The decl() method can become a trait-associated const field which
unlocks future optimizations

Callers of ops need to switch from:
`op_net_connect_tcp::call::<TestPermission>(conn_state, ip_addr)` to
`op_net_connect_tcp::<TestPermission>::call(conn_state, ip_addr)`.
---
 ops/optimizer_tests/callback_options.out | 66 ++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 20 deletions(-)

(limited to 'ops/optimizer_tests/callback_options.out')

diff --git a/ops/optimizer_tests/callback_options.out b/ops/optimizer_tests/callback_options.out
index d46d46765..a868d6393 100644
--- a/ops/optimizer_tests/callback_options.out
+++ b/ops/optimizer_tests/callback_options.out
@@ -3,16 +3,39 @@
 ///
 ///Use `op_fallback::decl()` to get an op-declaration
 ///you can include in a `deno_core::Extension`.
-pub struct op_fallback;
+pub struct op_fallback {
+    _phantom_data: ::std::marker::PhantomData<()>,
+}
+impl deno_core::_ops::Op for op_fallback {
+    const NAME: &'static str = stringify!(op_fallback);
+    const DECL: deno_core::OpDecl = deno_core::OpDecl {
+        name: Self::name(),
+        v8_fn_ptr: Self::v8_fn_ptr as _,
+        enabled: true,
+        fast_fn: {
+            use deno_core::v8::fast_api::CType;
+            use deno_core::v8::fast_api::Type::*;
+            Some(
+                deno_core::v8::fast_api::FastFunction::new(
+                    &[V8Value, CallbackOptions],
+                    CType::Void,
+                    Self::op_fallback_fast_fn as *const ::std::ffi::c_void,
+                ),
+            )
+        },
+        is_async: false,
+        is_unstable: false,
+        is_v8: false,
+        arg_count: 0,
+    };
+}
 #[doc(hidden)]
 impl op_fallback {
     pub const fn name() -> &'static str {
         stringify!(op_fallback)
     }
     #[allow(clippy::not_unsafe_ptr_arg_deref)]
-    pub extern "C" fn v8_fn_ptr<'scope>(
-        info: *const deno_core::v8::FunctionCallbackInfo,
-    ) {
+    pub extern "C" fn v8_fn_ptr(info: *const deno_core::v8::FunctionCallbackInfo) {
         let info = unsafe { &*info };
         let scope = &mut unsafe { deno_core::v8::CallbackScope::new(info) };
         let args = deno_core::v8::FunctionCallbackArguments::from_function_callback_info(
@@ -21,19 +44,19 @@ impl op_fallback {
         let rv = deno_core::v8::ReturnValue::from_function_callback_info(info);
         Self::v8_func(scope, args, rv);
     }
-    pub const fn decl<'scope>() -> deno_core::OpDecl {
+    pub const fn decl() -> deno_core::OpDecl {
         deno_core::OpDecl {
             name: Self::name(),
             v8_fn_ptr: Self::v8_fn_ptr as _,
             enabled: true,
             fast_fn: {
-                use deno_core::v8::fast_api::Type::*;
                 use deno_core::v8::fast_api::CType;
+                use deno_core::v8::fast_api::Type::*;
                 Some(
                     deno_core::v8::fast_api::FastFunction::new(
                         &[V8Value, CallbackOptions],
                         CType::Void,
-                        op_fallback_fast_fn as *const ::std::ffi::c_void,
+                        Self::op_fallback_fast_fn as *const ::std::ffi::c_void,
                     ),
                 )
             },
@@ -45,7 +68,8 @@ impl op_fallback {
     }
     #[inline]
     #[allow(clippy::too_many_arguments)]
-    fn call(options: Option<&mut FastApiCallbackOptions>) {
+    #[allow(clippy::extra_unused_lifetimes)]
+    fn call<'scope>(options: Option<&mut FastApiCallbackOptions>) {
         if let Some(options) = options {
             options.fallback = true;
         }
@@ -65,16 +89,18 @@ impl op_fallback {
         op_state.tracker.track_sync(ctx.id);
     }
 }
-#[allow(clippy::too_many_arguments)]
-fn op_fallback_fast_fn<'scope>(
-    _: deno_core::v8::Local<deno_core::v8::Object>,
-    fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
-) -> () {
-    use deno_core::v8;
-    use deno_core::_ops;
-    let __opts: &mut v8::fast_api::FastApiCallbackOptions = unsafe {
-        &mut *fast_api_callback_options
-    };
-    let result = op_fallback::call(options);
-    result
+impl op_fallback {
+    #[allow(clippy::too_many_arguments)]
+    fn op_fallback_fast_fn(
+        _: deno_core::v8::Local<deno_core::v8::Object>,
+        fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
+    ) -> () {
+        use deno_core::v8;
+        use deno_core::_ops;
+        let __opts: &mut v8::fast_api::FastApiCallbackOptions = unsafe {
+            &mut *fast_api_callback_options
+        };
+        let result = Self::call(options);
+        result
+    }
 }
-- 
cgit v1.2.3