diff options
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | runtime/web_worker.rs | 15 | ||||
| -rw-r--r-- | runtime/worker.rs | 6 |
4 files changed, 18 insertions, 21 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1a9f18971..0396cdf14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1067,9 +1067,9 @@ dependencies = [ [[package]] name = "deno_core" -version = "0.232.0" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229ffd108e028b148a1a5a6122f771bc7c37094170226f44b8b93b3a9b79d114" +checksum = "1b1c9dadf191bb484179cf4a599e0ccbe8ea62f35676a15397f171aff14bd9a0" dependencies = [ "anyhow", "bytes", @@ -1492,9 +1492,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.108.0" +version = "0.109.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7dde627916f8539f3f0d2e754dda40810c8ca4d655f2eaac1ef54785a12fd27" +checksum = "a3901bf4ce170c37d936ce8b947ba0217e5d235ebbbc1c340703268141c359d3" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -4635,9 +4635,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.141.0" +version = "0.142.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc689cb316d67b200e9f7449ce76cceb7e483e0f828d1a9c3d057c4367b6c26e" +checksum = "6abec9ca384cb6869fcbf7ab816bd0d342cd2668fa7b090d80554831e2d93e60" dependencies = [ "bytes", "derive_more", @@ -6034,9 +6034,9 @@ dependencies = [ [[package]] name = "v8" -version = "0.81.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75f5f378b9b54aff3b10da8170d26af4cfd217f644cf671badcd13af5db4beb" +checksum = "f53dfb242f4c0c39ed3fc7064378a342e57b5c9bd774636ad34ffe405b808121" dependencies = [ "bitflags 1.3.2", "fslock", diff --git a/Cargo.toml b/Cargo.toml index 7aa1dbec2..b1c85efdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ repository = "https://github.com/denoland/deno" [workspace.dependencies] deno_ast = { version = "0.31.6", features = ["transpiling"] } -deno_core = { version = "0.232.0" } +deno_core = { version = "0.233.0" } deno_runtime = { version = "0.133.0", path = "./runtime" } napi_sym = { version = "0.55.0", path = "./cli/napi/sym" } 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 } } } |