summaryrefslogtreecommitdiff
path: root/runtime/worker.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-12-20 15:14:19 +0100
committerGitHub <noreply@github.com>2020-12-20 15:14:19 +0100
commit3eec73ff904e54b6e90879d93b09be4330c63712 (patch)
treed1cd44eb9dc1eb9556a6d6ce82da95620b0359fb /runtime/worker.rs
parente924bbdf3606e83ff9eef3a8ed640c4ecc34444f (diff)
Revert "fix: TLA in web worker (#8809)" (#8839)
This reverts commit e924bbdf3606e83ff9eef3a8ed640c4ecc34444f.
Diffstat (limited to 'runtime/worker.rs')
-rw-r--r--runtime/worker.rs17
1 files changed, 1 insertions, 16 deletions
diff --git a/runtime/worker.rs b/runtime/worker.rs
index b01da4553..adb525c4c 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -10,7 +10,6 @@ use crate::permissions::Permissions;
use deno_core::error::AnyError;
use deno_core::futures::future::poll_fn;
use deno_core::futures::future::FutureExt;
-use deno_core::futures::stream::StreamExt;
use deno_core::serde_json;
use deno_core::serde_json::json;
use deno_core::url::Url;
@@ -212,21 +211,7 @@ impl MainWorker {
) -> Result<(), AnyError> {
let id = self.preload_module(module_specifier).await?;
self.wait_for_inspector_session();
- let mut receiver = self.js_runtime.mod_evaluate(id);
- tokio::select! {
- maybe_result = receiver.next() => {
- debug!("received module evaluate {:#?}", maybe_result);
- let result = maybe_result.expect("Module evaluation result not provided.");
- return result;
- }
-
- event_loop_result = self.run_event_loop() => {
- event_loop_result?;
- let maybe_result = receiver.next().await;
- let result = maybe_result.expect("Module evaluation result not provided.");
- return result;
- }
- }
+ self.js_runtime.mod_evaluate(id).await
}
fn wait_for_inspector_session(&mut self) {