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)

---
 core/modules.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'core/modules.rs')

diff --git a/core/modules.rs b/core/modules.rs
index 5a00d92cc..ca850d0bb 100644
--- a/core/modules.rs
+++ b/core/modules.rs
@@ -745,7 +745,9 @@ mod tests {
       ]
     );
 
-    let modules = &isolate.modules;
+    let state_rc = EsIsolate::state(&isolate);
+    let state = state_rc.borrow();
+    let modules = &state.modules;
     assert_eq!(modules.get_id("file:///a.js"), Some(a_id));
     let b_id = modules.get_id("file:///b.js").unwrap();
     let c_id = modules.get_id("file:///c.js").unwrap();
@@ -807,7 +809,9 @@ mod tests {
         ]
       );
 
-      let modules = &isolate.modules;
+      let state_rc = EsIsolate::state(&isolate);
+      let state = state_rc.borrow();
+      let modules = &state.modules;
 
       assert_eq!(modules.get_id("file:///circular1.js"), Some(circular1_id));
       let circular2_id = modules.get_id("file:///circular2.js").unwrap();
@@ -878,7 +882,9 @@ mod tests {
         ]
       );
 
-      let modules = &isolate.modules;
+      let state_rc = EsIsolate::state(&isolate);
+      let state = state_rc.borrow();
+      let modules = &state.modules;
 
       assert_eq!(modules.get_id("file:///redirect1.js"), Some(redirect1_id));
 
@@ -1016,7 +1022,9 @@ mod tests {
       vec!["file:///b.js", "file:///c.js", "file:///d.js"]
     );
 
-    let modules = &isolate.modules;
+    let state_rc = EsIsolate::state(&isolate);
+    let state = state_rc.borrow();
+    let modules = &state.modules;
 
     assert_eq!(modules.get_id("file:///main_with_code.js"), Some(main_id));
     let b_id = modules.get_id("file:///b.js").unwrap();
-- 
cgit v1.2.3