From d4b05dd89e94ed1bba5b24c683da0a895f2ce597 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 29 May 2020 17:41:39 -0400
Subject: refactor: Split isolate and state using safe get_slot() (#5929)

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

(limited to 'deno_typescript')

diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs
index 590e29917..a56c4fa7c 100644
--- a/deno_typescript/lib.rs
+++ b/deno_typescript/lib.rs
@@ -9,6 +9,7 @@ mod ops;
 use deno_core::js_check;
 pub use deno_core::v8_set_flags;
 use deno_core::CoreIsolate;
+use deno_core::CoreIsolateState;
 use deno_core::ErrBox;
 use deno_core::ModuleSpecifier;
 use deno_core::Op;
@@ -49,11 +50,11 @@ pub struct TSState {
 fn compiler_op<D>(
   ts_state: Arc<Mutex<TSState>>,
   dispatcher: D,
-) -> impl Fn(&mut CoreIsolate, &[u8], Option<ZeroCopyBuf>) -> Op
+) -> impl Fn(&mut CoreIsolateState, &[u8], Option<ZeroCopyBuf>) -> Op
 where
   D: Fn(&mut TSState, &[u8]) -> Op,
 {
-  move |_isolate: &mut CoreIsolate,
+  move |_state: &mut CoreIsolateState,
         control: &[u8],
         zero_copy_buf: Option<ZeroCopyBuf>|
         -> Op {
@@ -64,7 +65,7 @@ where
 }
 
 pub struct TSIsolate {
-  isolate: Box<CoreIsolate>,
+  isolate: CoreIsolate,
   state: Arc<Mutex<TSState>>,
 }
 
@@ -331,11 +332,11 @@ pub fn trace_serializer() {
 /// CoreIsolate.
 pub fn op_fetch_asset<S: ::std::hash::BuildHasher>(
   custom_assets: HashMap<String, PathBuf, S>,
-) -> impl Fn(&mut CoreIsolate, &[u8], Option<ZeroCopyBuf>) -> Op {
+) -> impl Fn(&mut CoreIsolateState, &[u8], Option<ZeroCopyBuf>) -> Op {
   for (_, path) in custom_assets.iter() {
     println!("cargo:rerun-if-changed={}", path.display());
   }
-  move |_isolate: &mut CoreIsolate,
+  move |_state: &mut CoreIsolateState,
         control: &[u8],
         zero_copy_buf: Option<ZeroCopyBuf>|
         -> Op {
-- 
cgit v1.2.3