From a23c3ccc702b6616a6257099452d4d9ae5162da2 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Sat, 10 Feb 2024 19:08:02 -0700 Subject: [PATCH] chore: deno_core bump (#22379) - Updates to V8 12.1.285.27 https://github.com/denoland/rusty_v8/pull/1383 - Swaps Box for Rc for `source_map_getter` --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- cli/module_loader.rs | 4 ++-- cli/standalone/mod.rs | 2 +- cli/worker.rs | 2 +- runtime/web_worker.rs | 2 +- runtime/worker.rs | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93cac1a19d..c52c62bf45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1226,9 +1226,9 @@ dependencies = [ [[package]] name = "deno_core" -version = "0.260.0" +version = "0.261.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73aca42c38336874c2cd141182b7e782dfea25b8dc2ca1d699ce0e6b47f38ca9" +checksum = "7743b191a1004e4989caf50c4ace8e3208732456118e79d433e2aff246772066" dependencies = [ "anyhow", "bit-set", @@ -1676,9 +1676,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.136.0" +version = "0.137.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588b2d0792b1668e6aa85c082821c5815cb9dc974e9ec978387d9c9dda32c771" +checksum = "7ee5973f100f3ff9dea83a5b6261276d233c51ebc7f4c4fcdebd4c0d476b4fe5" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -5450,9 +5450,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.169.0" +version = "0.170.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad4064ec3eeb8e013080e269242d3f074ca74d4a3806672d91da4cbfdc7ef6d8" +checksum = "43cce12a1cbf76530919847280a975a7831dab85a73d513161a5e6153a8e75d6" dependencies = [ "bytes", "derive_more", @@ -6904,9 +6904,9 @@ dependencies = [ [[package]] name = "v8" -version = "0.83.1" +version = "0.83.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546dcbb978f58aea3ad9286bd1df553f4ab7bbdc2e191cd4ae6c9a98fa95d1cd" +checksum = "9f6c8a960dd2eb74b22eda64f7e9f3d1688f82b80202828dc0425ebdeda826ef" dependencies = [ "bitflags 2.4.1", "fslock", diff --git a/Cargo.toml b/Cargo.toml index 868f785144..1c9d311091 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ repository = "https://github.com/denoland/deno" [workspace.dependencies] deno_ast = { version = "0.33.2", features = ["transpiling"] } -deno_core = { version = "0.260.0" } +deno_core = { version = "0.261.0" } deno_bench_util = { version = "0.131.0", path = "./bench_util" } deno_lockfile = "0.18.2" diff --git a/cli/module_loader.rs b/cli/module_loader.rs index 4b120796b2..84ced345f7 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -443,8 +443,8 @@ impl ModuleLoaderFactory for CliModuleLoaderFactory { ) } - fn create_source_map_getter(&self) -> Option> { - Some(Box::new(CliSourceMapGetter { + fn create_source_map_getter(&self) -> Option> { + Some(Rc::new(CliSourceMapGetter { shared: self.shared.clone(), })) } diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 4049d67092..e25b61c310 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -280,7 +280,7 @@ impl ModuleLoaderFactory for StandaloneModuleLoaderFactory { fn create_source_map_getter( &self, - ) -> Option> { + ) -> Option> { None } } diff --git a/cli/worker.rs b/cli/worker.rs index e5a7505979..e897c1a86e 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -73,7 +73,7 @@ pub trait ModuleLoaderFactory: Send + Sync { dynamic_permissions: PermissionsContainer, ) -> Rc; - fn create_source_map_getter(&self) -> Option>; + fn create_source_map_getter(&self) -> Option>; } // todo(dsherret): this is temporary and we should remove this diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index b21833a2e4..a69c384abb 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -345,7 +345,7 @@ pub struct WebWorkerOptions { pub npm_resolver: Option>, pub create_web_worker_cb: Arc, pub format_js_error_fn: Option>, - pub source_map_getter: Option>, + pub source_map_getter: Option>, pub worker_type: WebWorkerType, pub maybe_inspector_server: Option>, pub get_error_class_fn: Option, diff --git a/runtime/worker.rs b/runtime/worker.rs index 449c50e10d..b6aff3c157 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -153,7 +153,7 @@ pub struct WorkerOptions { pub format_js_error_fn: Option>, /// Source map reference for errors. - pub source_map_getter: Option>, + pub source_map_getter: Option>, pub maybe_inspector_server: Option>, // If true, the worker will wait for inspector session and break on first // statement of user code. Takes higher precedence than