From 058579da562989ed15c86598053644bbc86c6747 Mon Sep 17 00:00:00 2001 From: Aaron O'Mullan Date: Fri, 2 Apr 2021 15:47:57 +0200 Subject: refactor(ops): remove variadic buffers (#9944) --- cli/ops/errors.rs | 4 ++-- cli/ops/mod.rs | 5 ++--- cli/ops/runtime_compiler.rs | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'cli') diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs index 9ab953013..5dc4026f7 100644 --- a/cli/ops/errors.rs +++ b/cli/ops/errors.rs @@ -30,7 +30,7 @@ struct ApplySourceMap { fn op_apply_source_map( state: &mut OpState, args: Value, - _zero_copy: &mut [ZeroCopyBuf], + _zero_copy: Option, ) -> Result { let args: ApplySourceMap = serde_json::from_value(args)?; @@ -56,7 +56,7 @@ fn op_apply_source_map( fn op_format_diagnostic( _state: &mut OpState, args: Value, - _zero_copy: &mut [ZeroCopyBuf], + _zero_copy: Option, ) -> Result { let diagnostic: Diagnostics = serde_json::from_value(args)?; Ok(json!(diagnostic.to_string())) diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs index e47722198..782b0a201 100644 --- a/cli/ops/mod.rs +++ b/cli/ops/mod.rs @@ -7,7 +7,6 @@ use deno_core::error::AnyError; use deno_core::json_op_async; use deno_core::json_op_sync; use deno_core::serde_json::Value; -use deno_core::BufVec; use deno_core::JsRuntime; use deno_core::OpState; use deno_core::ZeroCopyBuf; @@ -18,7 +17,7 @@ use std::rc::Rc; pub fn reg_json_async(rt: &mut JsRuntime, name: &'static str, op_fn: F) where - F: Fn(Rc>, Value, BufVec) -> R + 'static, + F: Fn(Rc>, Value, Option) -> R + 'static, R: Future> + 'static, { rt.register_op(name, metrics_op(name, json_op_async(op_fn))); @@ -26,7 +25,7 @@ where pub fn reg_json_sync(rt: &mut JsRuntime, name: &'static str, op_fn: F) where - F: Fn(&mut OpState, Value, &mut [ZeroCopyBuf]) -> Result + F: Fn(&mut OpState, Value, Option) -> Result + 'static, { rt.register_op(name, metrics_op(name, json_op_sync(op_fn))); diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs index 79f378d6d..81b400d13 100644 --- a/cli/ops/runtime_compiler.rs +++ b/cli/ops/runtime_compiler.rs @@ -17,8 +17,8 @@ use deno_core::resolve_url_or_path; use deno_core::serde_json; use deno_core::serde_json::json; use deno_core::serde_json::Value; -use deno_core::BufVec; use deno_core::OpState; +use deno_core::ZeroCopyBuf; use deno_runtime::permissions::Permissions; use serde::Deserialize; use std::cell::RefCell; @@ -54,7 +54,7 @@ struct EmitArgs { async fn op_emit( state: Rc>, args: Value, - _data: BufVec, + _data: Option, ) -> Result { deno_runtime::ops::check_unstable2(&state, "Deno.emit"); let args: EmitArgs = serde_json::from_value(args)?; -- cgit v1.2.3