From 4d2b9cd37af2b9d6a145a04fc93117922e43df3a Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Sat, 18 Apr 2020 20:05:13 -0400
Subject: Fix Op definitions (#4814)

---
 deno_typescript/lib.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'deno_typescript/lib.rs')

diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs
index 1fe81856c..cd843041e 100644
--- a/deno_typescript/lib.rs
+++ b/deno_typescript/lib.rs
@@ -8,10 +8,10 @@ extern crate serde_json;
 mod ops;
 use deno_core::js_check;
 pub use deno_core::v8_set_flags;
-use deno_core::CoreOp;
 use deno_core::ErrBox;
 use deno_core::Isolate;
 use deno_core::ModuleSpecifier;
+use deno_core::Op;
 use deno_core::StartupData;
 use deno_core::ZeroCopyBuf;
 pub use ops::EmitResult;
@@ -49,11 +49,11 @@ pub struct TSState {
 fn compiler_op<D>(
   ts_state: Arc<Mutex<TSState>>,
   dispatcher: D,
-) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp
+) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> Op
 where
-  D: Fn(&mut TSState, &[u8]) -> CoreOp,
+  D: Fn(&mut TSState, &[u8]) -> Op,
 {
-  move |control: &[u8], zero_copy_buf: Option<ZeroCopyBuf>| -> CoreOp {
+  move |control: &[u8], zero_copy_buf: Option<ZeroCopyBuf>| -> Op {
     assert!(zero_copy_buf.is_none()); // zero_copy_buf unused in compiler.
     let mut s = ts_state.lock().unwrap();
     dispatcher(&mut s, control)
@@ -326,11 +326,11 @@ pub fn trace_serializer() {
 /// Isolate.
 pub fn op_fetch_asset<S: ::std::hash::BuildHasher>(
   custom_assets: HashMap<String, PathBuf, S>,
-) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp {
+) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> Op {
   for (_, path) in custom_assets.iter() {
     println!("cargo:rerun-if-changed={}", path.display());
   }
-  move |control: &[u8], zero_copy_buf: Option<ZeroCopyBuf>| -> CoreOp {
+  move |control: &[u8], zero_copy_buf: Option<ZeroCopyBuf>| -> Op {
     assert!(zero_copy_buf.is_none()); // zero_copy_buf unused in this op.
     let name = std::str::from_utf8(control).unwrap();
 
-- 
cgit v1.2.3