From c7636a215ebb63bc87ee0176949291f96659598b Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 11 Oct 2016 15:36:36 +0200 Subject: [PATCH] Remove AsyncResponseListener. --- components/net_traits/lib.rs | 23 ----------------------- components/script/network_listener.rs | 10 +--------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 2908571bf84..aad61971fd7 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -262,18 +262,6 @@ pub trait Action { fn process(self, listener: &mut Listener); } -/// A listener for asynchronous network events. Cancelling the underlying request is unsupported. -pub trait AsyncResponseListener { - /// The response headers for a request have been received. - fn headers_available(&mut self, metadata: Result); - /// A portion of the response body has been received. This data is unavailable after - /// this method returned, and must be stored accordingly. - fn data_available(&mut self, payload: Vec); - /// The response is complete. If the provided status is an Err value, there is no guarantee - /// that the response body was completely read. - fn response_complete(&mut self, status: Result<(), NetworkError>); -} - /// Data for passing between threads/processes to indicate a particular action to /// take on a provided network listener. #[derive(Deserialize, Serialize)] @@ -286,17 +274,6 @@ pub enum ResponseAction { ResponseComplete(Result<(), NetworkError>) } -impl Action for ResponseAction { - /// Execute the default action on a provided listener. - fn process(self, listener: &mut T) { - match self { - ResponseAction::HeadersAvailable(m) => listener.headers_available(m), - ResponseAction::DataAvailable(d) => listener.data_available(d), - ResponseAction::ResponseComplete(r) => listener.response_complete(r), - } - } -} - impl Action for FetchResponseMsg { /// Execute the default action on a provided listener. fn process(self, listener: &mut T) { diff --git a/components/script/network_listener.rs b/components/script/network_listener.rs index 4ff65bf8073..d69b7334bad 100644 --- a/components/script/network_listener.rs +++ b/components/script/network_listener.rs @@ -2,8 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use net_traits::{Action, AsyncResponseListener, FetchResponseListener}; -use net_traits::{FetchResponseMsg, ResponseAction}; +use net_traits::{Action, FetchResponseListener, FetchResponseMsg}; use script_runtime::{CommonScriptMsg, ScriptChan}; use script_runtime::ScriptThreadEventCategory::NetworkEvent; use script_thread::{Runnable, RunnableWrapper}; @@ -34,13 +33,6 @@ impl NetworkListener { } } -// helps type inference -impl NetworkListener { - pub fn notify_action(&self, action: ResponseAction) { - self.notify(action); - } -} - // helps type inference impl NetworkListener { pub fn notify_fetch(&self, action: FetchResponseMsg) {