From cfe4369dedcdd885c60b8a5f6c89bc4bb7e5e1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Mon, 2 Mar 2020 19:12:49 +0100
Subject: refactor: rename structures related to Modules (#4217)

* rename structures related to ES Modules; add "Modules" prefix
* remove unneeded Unpin trait requirement for "ModuleLoader"
---
 cli/ops/compiler.rs | 2 +-
 cli/state.rs        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'cli')

diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index 9e8895519..e6ed364da 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -6,7 +6,7 @@ use crate::futures::future::try_join_all;
 use crate::msg;
 use crate::op_error::OpError;
 use crate::state::State;
-use deno_core::Loader;
+use deno_core::ModuleLoader;
 use deno_core::*;
 use futures::future::FutureExt;
 
diff --git a/cli/state.rs b/cli/state.rs
index 5b8416093..8ad122036 100644
--- a/cli/state.rs
+++ b/cli/state.rs
@@ -12,7 +12,7 @@ use crate::worker::WorkerHandle;
 use deno_core::Buf;
 use deno_core::CoreOp;
 use deno_core::ErrBox;
-use deno_core::Loader;
+use deno_core::ModuleLoader;
 use deno_core::ModuleSpecifier;
 use deno_core::Op;
 use deno_core::ResourceTable;
@@ -151,7 +151,7 @@ impl State {
   }
 }
 
-impl Loader for State {
+impl ModuleLoader for State {
   fn resolve(
     &self,
     specifier: &str,
@@ -178,7 +178,7 @@ impl Loader for State {
     module_specifier: &ModuleSpecifier,
     maybe_referrer: Option<ModuleSpecifier>,
     is_dyn_import: bool,
-  ) -> Pin<Box<deno_core::SourceCodeInfoFuture>> {
+  ) -> Pin<Box<deno_core::ModuleSourceFuture>> {
     let module_specifier = module_specifier.clone();
     if is_dyn_import {
       if let Err(e) = self.check_dyn_import(&module_specifier) {
@@ -196,7 +196,7 @@ impl Loader for State {
       let compiled_module = global_state
         .fetch_compiled_module(module_specifier, maybe_referrer, target_lib)
         .await?;
-      Ok(deno_core::SourceCodeInfo {
+      Ok(deno_core::ModuleSource {
         // Real module name, might be different from initial specifier
         // due to redirections.
         code: compiled_module.code,
-- 
cgit v1.2.3