diff options
Diffstat (limited to 'components/net/http_loader.rs')
-rw-r--r-- | components/net/http_loader.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index bccfb03b8a4..0ac6980bb69 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -2,7 +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::{ControlMsg, CookieSource, LoadData, Metadata, ResponseSenders}; +use net_traits::{ControlMsg, CookieSource, LoadData, Metadata, LoadConsumer}; use net_traits::ProgressMsg::{Payload, Done}; use mime_classifier::MIMEClassifier; use resource_task::{start_sending_opt, start_sending_sniffed_opt}; @@ -32,13 +32,13 @@ use url::{Url, UrlParser}; use std::borrow::ToOwned; pub fn factory(cookies_chan: Sender<ControlMsg>) - -> Box<Invoke<(LoadData, ResponseSenders, Arc<MIMEClassifier>)> + Send> { + -> Box<Invoke<(LoadData, LoadConsumer, Arc<MIMEClassifier>)> + Send> { box move |(load_data, senders, classifier)| { spawn_named("http_loader".to_owned(), move || load(load_data, senders, classifier, cookies_chan)) } } -fn send_error(url: Url, err: String, start_chan: ResponseSenders) { +fn send_error(url: Url, err: String, start_chan: LoadConsumer) { let mut metadata: Metadata = Metadata::default(url); metadata.status = None; @@ -66,7 +66,7 @@ fn read_block<R: Read>(reader: &mut R) -> Result<ReadResult, ()> { } } -fn load(mut load_data: LoadData, start_chan: ResponseSenders, classifier: Arc<MIMEClassifier>, cookies_chan: Sender<ControlMsg>) { +fn load(mut load_data: LoadData, start_chan: LoadConsumer, classifier: Arc<MIMEClassifier>, cookies_chan: Sender<ControlMsg>) { // FIXME: At the time of writing this FIXME, servo didn't have any central // location for configuration. If you're reading this and such a // repository DOES exist, please update this constant to use it. @@ -339,7 +339,7 @@ reason: \"certificate verify failed\" }]"; } fn send_data<R: Read>(reader: &mut R, - start_chan: ResponseSenders, + start_chan: LoadConsumer, metadata: Metadata, classifier: Arc<MIMEClassifier>) { let (progress_chan, mut chunk) = { |