diff options
author | gurv-s <vargwin@gmail.com> | 2019-06-08 16:40:12 +0530 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2019-06-08 10:59:20 -0400 |
commit | 35f879ad32bc7fddb1c20e9a4154f42c7b9b8350 (patch) | |
tree | 4946e49a5835bad88072b136fbfec44fc86a19e9 /cli/ops.rs | |
parent | 95eac608a6e9793307d6f19a546a2a980542b839 (diff) |
Remove tokio_util::block_on dep in compile_async and other cleanup
Diffstat (limited to 'cli/ops.rs')
-rw-r--r-- | cli/ops.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cli/ops.rs b/cli/ops.rs index af1dddcee..c76983c47 100644 --- a/cli/ops.rs +++ b/cli/ops.rs @@ -33,11 +33,11 @@ use deno::Op; use deno::PinnedBuf; use flatbuffers::FlatBufferBuilder; use futures; +use futures::future; use futures::Async; use futures::Poll; use futures::Sink; use futures::Stream; -use futures::future; use hyper; use hyper::rt::Future; use rand::{thread_rng, Rng}; @@ -2066,7 +2066,7 @@ fn op_create_worker( Ok( worker .execute_mod_async(&specifier_url, false) - .and_then(move |worker| { + .and_then(move |()| { let mut workers_tl = parent_state.workers.lock().unwrap(); workers_tl.insert(rid, worker.shared()); let builder = &mut FlatBufferBuilder::new(); @@ -2084,10 +2084,8 @@ fn op_create_worker( }, )) }).map_err(|err| match err { - (errors::RustOrJsError::Js(_), _worker) => { - errors::worker_init_failed() - } - (errors::RustOrJsError::Rust(err), _worker) => err, + errors::RustOrJsError::Js(_) => errors::worker_init_failed(), + errors::RustOrJsError::Rust(err) => err, }), ) }).map_err(DenoError::from); |