diff options
| author | Divy Srivastava <dj.srivastava23@gmail.com> | 2024-07-20 18:05:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-21 03:05:35 +0200 |
| commit | 6c5905dbc354ae701f06c734608af834a0ba844c (patch) | |
| tree | 0e5d37db243cd6d891e9417f3e592ce2caab70be /cli/worker.rs | |
| parent | 5f6d84a281da311af5f31b431fa9b2bf642a4f21 (diff) | |
fix: CFunctionInfo and CTypeInfo leaks (#24634)
Trying out the deno_core patch
Ref https://github.com/denoland/deno_core/pull/832
Closes https://github.com/denoland/deno/issues/24575
---------
Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>
Diffstat (limited to 'cli/worker.rs')
| -rw-r--r-- | cli/worker.rs | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/cli/worker.rs b/cli/worker.rs index 36435d634..a639dae41 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -18,7 +18,6 @@ use deno_core::ModuleId; use deno_core::ModuleLoader; use deno_core::PollEventLoopOptions; use deno_core::SharedArrayBufferStore; -use deno_core::SourceMapGetter; use deno_runtime::code_cache; use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel; use deno_runtime::deno_fs; @@ -55,7 +54,6 @@ use crate::version; pub struct ModuleLoaderAndSourceMapGetter { pub module_loader: Rc<dyn ModuleLoader>, - pub source_map_getter: Option<Rc<dyn SourceMapGetter>>, } pub trait ModuleLoaderFactory: Send + Sync { @@ -516,10 +514,7 @@ impl CliMainWorkerFactory { (main_module, false) }; - let ModuleLoaderAndSourceMapGetter { - module_loader, - source_map_getter, - } = shared + let ModuleLoaderAndSourceMapGetter { module_loader } = shared .module_loader_factory .create_for_main(PermissionsContainer::allow_all(), permissions.clone()); let maybe_inspector_server = shared.maybe_inspector_server.clone(); @@ -596,7 +591,6 @@ impl CliMainWorkerFactory { .clone(), root_cert_store_provider: Some(shared.root_cert_store_provider.clone()), seed: shared.options.seed, - source_map_getter, format_js_error_fn: Some(Arc::new(format_js_error)), create_web_worker_cb, maybe_inspector_server, @@ -730,13 +724,11 @@ fn create_web_worker_callback( Arc::new(move |args| { let maybe_inspector_server = shared.maybe_inspector_server.clone(); - let ModuleLoaderAndSourceMapGetter { - module_loader, - source_map_getter, - } = shared.module_loader_factory.create_for_worker( - args.parent_permissions.clone(), - args.permissions.clone(), - ); + let ModuleLoaderAndSourceMapGetter { module_loader } = + shared.module_loader_factory.create_for_worker( + args.parent_permissions.clone(), + args.permissions.clone(), + ); let create_web_worker_cb = create_web_worker_callback(mode, shared.clone(), stdio.clone()); @@ -802,7 +794,6 @@ fn create_web_worker_callback( seed: shared.options.seed, create_web_worker_cb, format_js_error_fn: Some(Arc::new(format_js_error)), - source_map_getter, module_loader, fs: shared.fs.clone(), node_resolver: Some(shared.node_resolver.clone()), |