summaryrefslogtreecommitdiff
path: root/core/runtime.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-09-20 01:17:35 +0200
committerGitHub <noreply@github.com>2020-09-20 01:17:35 +0200
commitb657d743a22802b8232fbf558f2f00bf2942096f (patch)
treee3a3047e78b6bd9c9e3f551f99f5e80e32de079d /core/runtime.rs
parentaaa5e6613a739f8e2ff7579b69c2504bcdc37d4f (diff)
refactor: remove CliState, use OpState, add CliModuleLoader (#7588)
- remove "CliState.workers" and "CliState.next_worker_id", instead store them on "OpState" using type aliases. - remove "CliState.global_timer" and "CliState.start_time", instead store them on "OpState" using type aliases. - remove "CliState.is_internal", instead pass it to Worker::new - move "CliState::permissions" to "OpState" - move "CliState::main_module" to "OpState" - move "CliState::global_state" to "OpState" - move "CliState::check_unstable()" to "GlobalState" - change "cli_state()" to "global_state()" - change "deno_core::ModuleLoader" trait to pass "OpState" to callbacks - rename "CliState" to "CliModuleLoader"
Diffstat (limited to 'core/runtime.rs')
-rw-r--r--core/runtime.rs13
1 files changed, 12 insertions, 1 deletions
diff --git a/core/runtime.rs b/core/runtime.rs
index e0a840c1a..9c076efd1 100644
--- a/core/runtime.rs
+++ b/core/runtime.rs
@@ -624,6 +624,7 @@ impl JsRuntimeState {
debug!("dyn_import specifier {} referrer {} ", specifier, referrer);
let load = RecursiveModuleLoad::dynamic_import(
+ self.op_state.clone(),
specifier,
referrer,
self.loader.clone(),
@@ -1207,7 +1208,12 @@ impl JsRuntime {
state.loader.clone()
};
- let load = RecursiveModuleLoad::main(&specifier.to_string(), code, loader);
+ let load = RecursiveModuleLoad::main(
+ self.op_state(),
+ &specifier.to_string(),
+ code,
+ loader,
+ );
let (_load_id, prepare_result) = load.prepare().await;
let mut load = prepare_result?;
@@ -1890,6 +1896,7 @@ pub mod tests {
fn load(
&self,
+ _op_state: Rc<RefCell<OpState>>,
_module_specifier: &ModuleSpecifier,
_maybe_referrer: Option<ModuleSpecifier>,
_is_dyn_import: bool,
@@ -1999,6 +2006,7 @@ pub mod tests {
fn load(
&self,
+ _op_state: Rc<RefCell<OpState>>,
_module_specifier: &ModuleSpecifier,
_maybe_referrer: Option<ModuleSpecifier>,
_is_dyn_import: bool,
@@ -2059,6 +2067,7 @@ pub mod tests {
fn load(
&self,
+ _op_state: Rc<RefCell<OpState>>,
specifier: &ModuleSpecifier,
_maybe_referrer: Option<ModuleSpecifier>,
_is_dyn_import: bool,
@@ -2074,6 +2083,7 @@ pub mod tests {
fn prepare_load(
&self,
+ _op_state: Rc<RefCell<OpState>>,
_load_id: ModuleLoadId,
_module_specifier: &ModuleSpecifier,
_maybe_referrer: Option<String>,
@@ -2179,6 +2189,7 @@ pub mod tests {
fn load(
&self,
+ _op_state: Rc<RefCell<OpState>>,
_module_specifier: &ModuleSpecifier,
_maybe_referrer: Option<ModuleSpecifier>,
_is_dyn_import: bool,