summaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorMatt Mastracci <matthew@mastracci.com>2023-11-27 16:01:27 -0700
committerGitHub <noreply@github.com>2023-11-27 16:01:27 -0700
commit5ab7c702bb5d83c294f0e68fe751e3ee6283e0a7 (patch)
tree9ec3a003f6fa2d1cb0f42c41694dbc6039eb3857 /runtime
parent3c8865455243c91105ab309de973d68c9db349d4 (diff)
chore: bump deno_core (#21351)
Diffstat (limited to 'runtime')
-rw-r--r--runtime/web_worker.rs15
-rw-r--r--runtime/worker.rs6
2 files changed, 9 insertions, 12 deletions
diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
index 9293fce17..243c60a29 100644
--- a/runtime/web_worker.rs
+++ b/runtime/web_worker.rs
@@ -693,13 +693,13 @@ impl WebWorker {
maybe_result = &mut receiver => {
debug!("received module evaluate {:#?}", maybe_result);
- maybe_result.expect("Module evaluation result not provided.")
+ maybe_result
}
event_loop_result = self.js_runtime.run_event_loop(false) => {
event_loop_result?;
- let maybe_result = receiver.await;
- maybe_result.expect("Module evaluation result not provided.")
+
+ receiver.await
}
}
}
@@ -722,10 +722,7 @@ impl WebWorker {
maybe_result = &mut receiver => {
debug!("received worker module evaluate {:#?}", maybe_result);
- // If `None` is returned it means that runtime was destroyed before
- // evaluation was complete. This can happen in Web Worker when `self.close()`
- // is called at top level.
- maybe_result.unwrap_or(Ok(()))
+ maybe_result
}
event_loop_result = self.run_event_loop(poll_options) => {
@@ -733,8 +730,8 @@ impl WebWorker {
return Ok(());
}
event_loop_result?;
- let maybe_result = receiver.await;
- maybe_result.unwrap_or(Ok(()))
+
+ receiver.await
}
}
}
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 667644dc8..1a1e07a4d 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -548,13 +548,13 @@ impl MainWorker {
maybe_result = &mut receiver => {
debug!("received module evaluate {:#?}", maybe_result);
- maybe_result.expect("Module evaluation result not provided.")
+ maybe_result
}
event_loop_result = self.run_event_loop(false) => {
event_loop_result?;
- let maybe_result = receiver.await;
- maybe_result.expect("Module evaluation result not provided.")
+
+ receiver.await
}
}
}