refactor: Cleanup core/modules.rs (denoland#13149)

hayd · Dec 21, 2021 · aca41a4 · aca41a4
1 parent 907cef5
commit aca41a4
Show file tree

Hide file tree

Showing 3 changed files with 178 additions and 202 deletions.
diff --git a/cli/module_loader.rs b/cli/module_loader.rs
@@ -6,7 +6,6 @@ use crate::proc_state::ProcState;
 use deno_core::error::AnyError;
 use deno_core::futures::future::FutureExt;
 use deno_core::futures::Future;
-use deno_core::ModuleLoadId;
 use deno_core::ModuleLoader;
 use deno_core::ModuleSpecifier;
 use deno_core::OpState;
@@ -84,7 +83,6 @@ impl ModuleLoader for CliModuleLoader {
  fn prepare_load(
  &self,
  op_state: Rc<RefCell<OpState>>,
- _load_id: ModuleLoadId,
  specifier: &ModuleSpecifier,
  _maybe_referrer: Option<String>,
  is_dynamic: bool,
@@ -108,7 +106,6 @@ impl ModuleLoader for CliModuleLoader {
  };
  drop(state);
 
- // TODO(bartlomieju): `prepare_module_load` should take `load_id` param
  async move {
  ps.prepare_module_load(
  vec![specifier],

diff --git a/core/lib.rs b/core/lib.rs
@@ -57,17 +57,11 @@ pub use crate::module_specifier::ModuleSpecifier;
 pub use crate::module_specifier::DUMMY_SPECIFIER;
 pub use crate::modules::FsModuleLoader;
 pub use crate::modules::ModuleId;
-pub use crate::modules::ModuleLoadId;
 pub use crate::modules::ModuleLoader;
 pub use crate::modules::ModuleSource;
 pub use crate::modules::ModuleSourceFuture;
 pub use crate::modules::ModuleType;
 pub use crate::modules::NoopModuleLoader;
-pub use crate::runtime::CompiledWasmModuleStore;
-pub use crate::runtime::SharedArrayBufferStore;
-// TODO(bartlomieju): this struct should be implementation
-// detail nad not be public
-pub use crate::modules::RecursiveModuleLoad;
 pub use crate::normalize_path::normalize_path;
 pub use crate::ops::serialize_op_result;
 pub use crate::ops::Op;
@@ -91,10 +85,12 @@ pub use crate::resources::AsyncResult;
 pub use crate::resources::Resource;
 pub use crate::resources::ResourceId;
 pub use crate::resources::ResourceTable;
+pub use crate::runtime::CompiledWasmModuleStore;
 pub use crate::runtime::GetErrorClassFn;
 pub use crate::runtime::JsErrorCreateFn;
 pub use crate::runtime::JsRuntime;
 pub use crate::runtime::RuntimeOptions;
+pub use crate::runtime::SharedArrayBufferStore;
 pub use crate::runtime::Snapshot;
 // pub use crate::runtime_modules::include_js_files!;
 pub use crate::extensions::Extension;