From 595aab10dccb3603bf60ff25eb45c4715a75ecb9 Mon Sep 17 00:00:00 2001 From: lwz23 <160561672+lwz23@users.noreply.github.com> Date: Thu, 17 Oct 2024 08:58:28 -0400 Subject: [PATCH] fix clippy warning in components/script (#33878) Signed-off-by: lwz23 --- components/script/dom/document.rs | 4 ++-- components/script/dom/globalscope.rs | 2 +- components/script/fetch.rs | 1 - components/script/network_listener.rs | 2 +- components/script/script_module.rs | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 2d497339da6..aa58c423298 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -2157,7 +2157,7 @@ impl Document { task_source, canceller: Some(canceller), } - .to_callback(); + .into_callback(); self.loader_mut() .fetch_async_with_callback(load, request, callback); } @@ -2177,7 +2177,7 @@ impl Document { task_source, canceller: Some(canceller), } - .to_callback(); + .into_callback(); self.loader_mut() .fetch_async_background(request, callback, cancel_override); } diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index 90b4459dc28..0e9ec399f4b 100644 --- a/components/script/dom/globalscope.rs +++ b/components/script/dom/globalscope.rs @@ -3424,7 +3424,7 @@ impl GlobalScope { &self.core_resource_thread(), request_builder, cancellation_receiver, - network_listener.to_callback(), + network_listener.into_callback(), ); } } diff --git a/components/script/fetch.rs b/components/script/fetch.rs index 107e59b8b4d..44c790a354e 100644 --- a/components/script/fetch.rs +++ b/components/script/fetch.rs @@ -345,7 +345,6 @@ pub fn load_whole_resource( loop { match action_receiver.recv().unwrap() { FetchResponseMsg::ProcessRequestBody(..) | FetchResponseMsg::ProcessRequestEOF(..) => { - () }, FetchResponseMsg::ProcessResponse(_, Ok(m)) => { metadata = Some(match m { diff --git a/components/script/network_listener.rs b/components/script/network_listener.rs index b2b64bc2614..41452701b9d 100644 --- a/components/script/network_listener.rs +++ b/components/script/network_listener.rs @@ -91,7 +91,7 @@ impl NetworkListen self.notify(action); } - pub fn to_callback(self) -> BoxedFetchCallback { + pub fn into_callback(self) -> BoxedFetchCallback { Box::new(move |response_msg| self.notify_fetch(response_msg)) } } diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 886d06f6c8e..60cd8a0ed41 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -1687,7 +1687,7 @@ fn fetch_single_module_script( document.loader_mut().fetch_async_with_callback( LoadType::Script(url), request, - network_listener.to_callback(), + network_listener.into_callback(), ); }, None => global.fetch_with_network_listener(request, network_listener, None),