From 40c711bf97f1d07ec84d8a1eb159eed46da46e27 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 11 Oct 2016 18:09:05 +0200 Subject: [PATCH] Remove LoadConsumer::Listener. --- components/net/resource_thread.rs | 12 +----------- components/net_traits/lib.rs | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index e6606b87b8c..9ee5bce0767 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -137,7 +137,7 @@ pub fn start_sending_sniffed_opt(start_chan: LoadConsumer, mut metadata: Metadat /// It takes an optional NetworkError, so that we can extract the SSL Validation errors /// and take it to the HTML parser fn start_sending_opt(start_chan: LoadConsumer, metadata: Metadata, - network_error: Option) -> Result { + _network_error: Option) -> Result { match start_chan { LoadConsumer::Channel(start_chan) => { let (progress_chan, progress_port) = ipc::channel().unwrap(); @@ -150,16 +150,6 @@ fn start_sending_opt(start_chan: LoadConsumer, metadata: Metadata, Err(_) => Err(()) } } - LoadConsumer::Listener(target) => { - match network_error { - Some(NetworkError::SslValidation(url, reason)) => { - let error = NetworkError::SslValidation(url, reason); - target.invoke_with_listener(ResponseAction::HeadersAvailable(Err(error))); - } - _ => target.invoke_with_listener(ResponseAction::HeadersAvailable(Ok(metadata))), - } - Ok(ProgressSender::Listener(target)) - } } } diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 08e4349b3da..ac3480f83c2 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -305,7 +305,6 @@ impl AsyncResponseTarget { #[derive(Deserialize, Serialize)] pub enum LoadConsumer { Channel(IpcSender), - Listener(AsyncResponseTarget), } /// Handle to a resource thread