diff options
| author | Gurwinder Singh <vargwin@gmail.com> | 2020-07-14 01:49:51 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 16:19:51 -0400 |
| commit | d51972377c1325076704d9faec2eee6f0e024496 (patch) | |
| tree | 67c75b20d8e07ff356652c71a6c9e87cd36ab41f /cli/ops | |
| parent | 6af5149ea3d9b0accf7122073abbf852e355846f (diff) | |
refactor: Make OpDispatcher a trait (#6736)
Diffstat (limited to 'cli/ops')
| -rw-r--r-- | cli/ops/dispatch_json.rs | 5 | ||||
| -rw-r--r-- | cli/ops/dispatch_minimal.rs | 5 | ||||
| -rw-r--r-- | cli/ops/plugin.rs | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/cli/ops/dispatch_json.rs b/cli/ops/dispatch_json.rs index 26ffc7d33..30a3a4433 100644 --- a/cli/ops/dispatch_json.rs +++ b/cli/ops/dispatch_json.rs @@ -3,6 +3,7 @@ use crate::op_error::OpError; use deno_core::Buf; use deno_core::CoreIsolateState; use deno_core::Op; +use deno_core::OpDispatcher; use deno_core::ZeroCopyBuf; use futures::future::FutureExt; pub use serde_derive::Deserialize; @@ -44,9 +45,7 @@ struct AsyncArgs { promise_id: Option<u64>, } -pub fn json_op<D>( - d: D, -) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op +pub fn json_op<D>(d: D) -> impl OpDispatcher where D: Fn( &mut CoreIsolateState, diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs index 45b90ef81..c37e57e45 100644 --- a/cli/ops/dispatch_minimal.rs +++ b/cli/ops/dispatch_minimal.rs @@ -9,6 +9,7 @@ use byteorder::{LittleEndian, WriteBytesExt}; use deno_core::Buf; use deno_core::CoreIsolateState; use deno_core::Op; +use deno_core::OpDispatcher; use deno_core::ZeroCopyBuf; use futures::future::FutureExt; use std::future::Future; @@ -114,9 +115,7 @@ fn test_parse_min_record() { assert_eq!(parse_min_record(&buf), None); } -pub fn minimal_op<D>( - d: D, -) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op +pub fn minimal_op<D>(d: D) -> impl OpDispatcher where D: Fn(&mut CoreIsolateState, bool, i32, &mut [ZeroCopyBuf]) -> MinimalOp, { diff --git a/cli/ops/plugin.rs b/cli/ops/plugin.rs index 16debac50..ba105cff8 100644 --- a/cli/ops/plugin.rs +++ b/cli/ops/plugin.rs @@ -110,7 +110,8 @@ impl<'a> plugin_api::Interface for PluginInterface<'a> { let plugin_lib = self.plugin_lib.clone(); self.isolate_state.op_registry.register( name, - move |isolate_state, zero_copy| { + move |isolate_state: &mut CoreIsolateState, + zero_copy: &mut [ZeroCopyBuf]| { let mut interface = PluginInterface::new(isolate_state, &plugin_lib); let op = dispatch_op_fn(&mut interface, zero_copy); match op { |