tidy up deno_core modules (#5923)

1 files changed, 12 insertions, 11 deletions

diff --git a/core/modules.rs b/core/modules.rs
index 632df2dd0..5a00d92cc 100644
--- a/core/modules.rs
+++ b/core/modules.rs
@@ -2,10 +2,8 @@
 
 use rusty_v8 as v8;
 
-use crate::any_error::ErrBox;
-use crate::es_isolate::ModuleId;
-use crate::es_isolate::ModuleLoadId;
 use crate::module_specifier::ModuleSpecifier;
+use crate::ErrBox;
 use futures::future::FutureExt;
 use futures::stream::FuturesUnordered;
 use futures::stream::Stream;
@@ -25,6 +23,9 @@ lazy_static! {
   pub static ref NEXT_LOAD_ID: AtomicI32 = AtomicI32::new(0);
 }
 
+pub type ModuleId = i32;
+pub type ModuleLoadId = i32;
+
 /// EsModule source code that will be loaded into V8.
 ///
 /// Users can implement `Into<ModuleInfo>` for different file types that
@@ -548,7 +549,8 @@ macro_rules! include_crate_modules {
 mod tests {
   use super::*;
   use crate::es_isolate::EsIsolate;
-  use crate::isolate::js_check;
+  use crate::js_check;
+  use crate::StartupData;
   use futures::future::FutureExt;
   use std::error::Error;
   use std::fmt;
@@ -556,6 +558,12 @@ mod tests {
   use std::sync::Arc;
   use std::sync::Mutex;
 
+  // TODO(ry) Sadly FuturesUnordered requires the current task to be set. So
+  // even though we are only using poll() in these tests and not Tokio, we must
+  // nevertheless run it in the tokio executor. Ideally run_in_task can be
+  // removed in the future.
+  use crate::core_isolate::tests::run_in_task;
+
   struct MockLoader {
     pub loads: Arc<Mutex<Vec<String>>>,
   }
@@ -716,13 +724,6 @@ mod tests {
     if (import.meta.url != 'file:///d.js') throw Error();
   "#;
 
-  // TODO(ry) Sadly FuturesUnordered requires the current task to be set. So
-  // even though we are only using poll() in these tests and not Tokio, we must
-  // nevertheless run it in the tokio executor. Ideally run_in_task can be
-  // removed in the future.
-  use crate::isolate::tests::run_in_task;
-  use crate::isolate::StartupData;
-
   #[test]
   fn test_recursive_load() {
     let loader = MockLoader::new();