diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2020-04-18 20:05:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-18 20:05:13 -0400 |
commit | 4d2b9cd37af2b9d6a145a04fc93117922e43df3a (patch) | |
tree | 72625816dd4dd2fabd34a74770f5b9c3a7b0554e /cli/ops/dispatch_minimal.rs | |
parent | e2fd729a0b26c299f0cc4e4618d1f97159b31a19 (diff) |
Fix Op definitions (#4814)
Diffstat (limited to 'cli/ops/dispatch_minimal.rs')
-rw-r--r-- | cli/ops/dispatch_minimal.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs index 299462ca0..7fdd12401 100644 --- a/cli/ops/dispatch_minimal.rs +++ b/cli/ops/dispatch_minimal.rs @@ -7,7 +7,6 @@ use crate::op_error::OpError; use byteorder::{LittleEndian, WriteBytesExt}; use deno_core::Buf; -use deno_core::CoreOp; use deno_core::Op; use deno_core::ZeroCopyBuf; use futures::future::FutureExt; @@ -114,7 +113,7 @@ fn test_parse_min_record() { assert_eq!(parse_min_record(&buf), None); } -pub fn minimal_op<D>(d: D) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp +pub fn minimal_op<D>(d: D) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> Op where D: Fn(bool, i32, Option<ZeroCopyBuf>) -> MinimalOp, { @@ -153,12 +152,11 @@ where } }), MinimalOp::Async(min_fut) => { - // Convert to CoreOp - let core_fut = async move { + let fut = async move { match min_fut.await { Ok(r) => { record.result = r; - Ok(record.into()) + record.into() } Err(err) => { let error_record = ErrorRecord { @@ -167,11 +165,11 @@ where error_code: err.kind as i32, error_message: err.msg.as_bytes().to_owned(), }; - Ok(error_record.into()) + error_record.into() } } }; - Op::Async(core_fut.boxed_local()) + Op::Async(fut.boxed_local()) } } } |