diff options
Diffstat (limited to 'cli/ops/web_worker.rs')
-rw-r--r-- | cli/ops/web_worker.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cli/ops/web_worker.rs b/cli/ops/web_worker.rs index 8ad497d5c..023a4708c 100644 --- a/cli/ops/web_worker.rs +++ b/cli/ops/web_worker.rs @@ -1,12 +1,12 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. use super::dispatch_json::{JsonOp, Value}; -use crate::op_error::OpError; use crate::ops::json_op; use crate::state::State; use crate::web_worker::WebWorkerHandle; use crate::worker::WorkerEvent; use deno_core::CoreIsolate; use deno_core::CoreIsolateState; +use deno_core::ErrBox; use deno_core::ZeroCopyBuf; use futures::channel::mpsc; use std::convert::From; @@ -19,18 +19,18 @@ pub fn web_worker_op<D>( &mut CoreIsolateState, Value, &mut [ZeroCopyBuf], -) -> Result<JsonOp, OpError> +) -> Result<JsonOp, ErrBox> where D: Fn( &mpsc::Sender<WorkerEvent>, Value, &mut [ZeroCopyBuf], - ) -> Result<JsonOp, OpError>, + ) -> Result<JsonOp, ErrBox>, { move |_isolate_state: &mut CoreIsolateState, args: Value, zero_copy: &mut [ZeroCopyBuf]| - -> Result<JsonOp, OpError> { dispatcher(&sender, args, zero_copy) } + -> Result<JsonOp, ErrBox> { dispatcher(&sender, args, zero_copy) } } pub fn web_worker_op2<D>( @@ -41,19 +41,19 @@ pub fn web_worker_op2<D>( &mut CoreIsolateState, Value, &mut [ZeroCopyBuf], -) -> Result<JsonOp, OpError> +) -> Result<JsonOp, ErrBox> where D: Fn( WebWorkerHandle, &mpsc::Sender<WorkerEvent>, Value, &mut [ZeroCopyBuf], - ) -> Result<JsonOp, OpError>, + ) -> Result<JsonOp, ErrBox>, { move |_isolate_state: &mut CoreIsolateState, args: Value, zero_copy: &mut [ZeroCopyBuf]| - -> Result<JsonOp, OpError> { + -> Result<JsonOp, ErrBox> { dispatcher(handle.clone(), &sender, args, zero_copy) } } @@ -86,7 +86,7 @@ fn op_worker_post_message( sender: &mpsc::Sender<WorkerEvent>, _args: Value, data: &mut [ZeroCopyBuf], -) -> Result<JsonOp, OpError> { +) -> Result<JsonOp, ErrBox> { assert_eq!(data.len(), 1, "Invalid number of arguments"); let d = Vec::from(&*data[0]).into_boxed_slice(); let mut sender = sender.clone(); @@ -102,7 +102,7 @@ fn op_worker_close( sender: &mpsc::Sender<WorkerEvent>, _args: Value, _data: &mut [ZeroCopyBuf], -) -> Result<JsonOp, OpError> { +) -> Result<JsonOp, ErrBox> { let mut sender = sender.clone(); // Notify parent that we're finished sender.close_channel(); |