From b2525c6f17cdc033fd6e9a5f199cd887b573455a Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 24 Sep 2021 12:30:09 -0400 Subject: [PATCH] Remove unused code --- core/inspector.rs | 6 ------ core/runtime.rs | 20 ++------------------ ext/net/ops_tls.rs | 4 ---- runtime/tokio_util.rs | 9 --------- runtime/web_worker.rs | 2 +- runtime/worker.rs | 10 ---------- 6 files changed, 3 insertions(+), 48 deletions(-) diff --git a/core/inspector.rs b/core/inspector.rs index 74e50dc693..c4dddc5d68 100644 --- a/core/inspector.rs +++ b/core/inspector.rs @@ -50,12 +50,6 @@ pub struct InspectorSessionProxy { pub rx: SessionProxyReceiver, } -impl InspectorSessionProxy { - pub fn split(self) -> (SessionProxySender, SessionProxyReceiver) { - (self.tx, self.rx) - } -} - #[derive(Clone, Copy)] enum PollState { Idle, diff --git a/core/runtime.rs b/core/runtime.rs index 9071463b50..4d9e76d481 100644 --- a/core/runtime.rs +++ b/core/runtime.rs @@ -603,7 +603,7 @@ impl JsRuntime { /// /// Calls the closure with the current heap limit and the initial heap limit. /// The return value of the closure is set as the new limit. - pub fn add_near_heap_limit_callback(&mut self, cb: C) + fn add_near_heap_limit_callback(&mut self, cb: C) where C: FnMut(usize, usize) -> usize + 'static, { @@ -625,7 +625,7 @@ impl JsRuntime { .add_near_heap_limit_callback(near_heap_limit_callback::, data); } - pub fn remove_near_heap_limit_callback(&mut self, heap_limit: usize) { + fn remove_near_heap_limit_callback(&mut self, heap_limit: usize) { if let Some((_, cb)) = self.allocations.near_heap_limit_callback_data.take() { self @@ -1424,22 +1424,6 @@ impl JsRuntime { Ok(root_id) } - /// Asynchronously load specified module and all of its dependencies - /// - /// User must call `JsRuntime::mod_evaluate` with returned `ModuleId` - /// manually after load is finished. - #[deprecated( - since = "0.100.0", - note = "This method had a bug, marking multiple modules loaded as \"main\". Use `load_main_module` or `load_side_module` instead." - )] - pub async fn load_module( - &mut self, - specifier: &ModuleSpecifier, - code: Option, - ) -> Result { - self.load_main_module(specifier, code).await - } - fn poll_pending_ops( &mut self, cx: &mut Context, diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs index 17367af548..548220688a 100644 --- a/ext/net/ops_tls.rs +++ b/ext/net/ops_tls.rs @@ -157,10 +157,6 @@ impl TlsStream { Self::new(tcp, tls) } - pub async fn handshake(&mut self) -> io::Result<()> { - poll_fn(|cx| self.inner_mut().poll_io(cx, Flow::Write)).await - } - fn into_split(self) -> (ReadHalf, WriteHalf) { let shared = Shared::new(self); let rd = ReadHalf { diff --git a/runtime/tokio_util.rs b/runtime/tokio_util.rs index 5ee45325d4..7a6f4d49e6 100644 --- a/runtime/tokio_util.rs +++ b/runtime/tokio_util.rs @@ -13,12 +13,3 @@ pub fn create_basic_runtime() -> tokio::runtime::Runtime { .build() .unwrap() } - -// TODO(ry) rename to run_local ? -pub fn run_basic(future: F) -> R -where - F: std::future::Future, -{ - let rt = create_basic_runtime(); - rt.block_on(future) -} diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 528546e9a1..7dd4082923 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -505,7 +505,7 @@ impl WebWorker { } } - pub fn poll_event_loop( + fn poll_event_loop( &mut self, cx: &mut Context, wait_for_inspector: bool, diff --git a/runtime/worker.rs b/runtime/worker.rs index 5cfd30dd10..0f95b816fd 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -29,8 +29,6 @@ use std::env; use std::pin::Pin; use std::rc::Rc; use std::sync::Arc; -use std::task::Context; -use std::task::Poll; /// This worker is created and used by almost all /// subcommands in Deno executable. @@ -280,14 +278,6 @@ impl MainWorker { inspector.create_local_session() } - pub fn poll_event_loop( - &mut self, - cx: &mut Context, - wait_for_inspector: bool, - ) -> Poll> { - self.js_runtime.poll_event_loop(cx, wait_for_inspector) - } - pub async fn run_event_loop( &mut self, wait_for_inspector: bool,