diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2020-01-08 15:06:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-08 15:06:04 +0100 |
commit | cbdf9c50095b86e72a8e0e715a02f6eb327f7c53 (patch) | |
tree | e663acae0cbb3410090b2ac087a28ce57987a606 /cli/lib.rs | |
parent | 8466460311ce3522d598def7155144b082b2b9ad (diff) |
refactor: module loading in EsIsolate (#3615)
* refactored RecursiveLoad - it was renamed to RecursiveModuleLoad, it does not take ownership of isolate anymore - a struct implementing Stream that yields SourceCodeInfo
* untangled module loading logic between RecursiveLoad and isolate - that logic is encapsulated in EsIsolate and RecursiveModuleLoad, where isolate just consumes modules as they become available - does not require to pass Arc<Mutex<Isolate>> around anymore
* removed EsIsolate.mods_ in favor of Modules and moved them inside EsIsolate
* EsIsolate now requires "loader" argument during construction - struct that implements Loader trait
* rewrite first methods on isolate as async
Diffstat (limited to 'cli/lib.rs')
-rw-r--r-- | cli/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cli/lib.rs b/cli/lib.rs index f0df3f149..6882fea20 100644 --- a/cli/lib.rs +++ b/cli/lib.rs @@ -172,7 +172,6 @@ fn print_cache_info(worker: Worker) { async fn print_file_info(worker: Worker, module_specifier: ModuleSpecifier) { let global_state_ = &worker.state.global_state; - let state_ = &worker.state; let maybe_source_file = global_state_ .file_fetcher @@ -233,7 +232,8 @@ async fn print_file_info(worker: Worker, module_specifier: ModuleSpecifier) { ); } - if let Some(deps) = state_.modules.lock().unwrap().deps(&compiled.name) { + let isolate = worker.isolate.try_lock().unwrap(); + if let Some(deps) = isolate.modules.deps(&compiled.name) { println!("{}{}", colors::bold("deps:\n".to_string()), deps.name); if let Some(ref depsdeps) = deps.deps { for d in depsdeps { |