diff options
Diffstat (limited to 'components/net/file_loader.rs')
| -rw-r--r-- | components/net/file_loader.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/components/net/file_loader.rs b/components/net/file_loader.rs index a81d0e8afdb..08de3298cf3 100644 --- a/components/net/file_loader.rs +++ b/components/net/file_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::{LoadData, Metadata, LoadConsumer}; +use net_traits::{LoadData, Metadata, LoadConsumer, SerializableStringResult}; use net_traits::ProgressMsg::{Payload, Done}; use mime_classifier::MIMEClassifier; use resource_task::{start_sending, start_sending_sniffed, ProgressSender}; @@ -48,7 +48,7 @@ pub fn factory(load_data: LoadData, senders: LoadConsumer, classifier: Arc<MIMEC let url = load_data.url; assert!(&*url.scheme == "file"); spawn_named("file_loader".to_owned(), move || { - let metadata = Metadata::default(url.clone()); + let metadata = Metadata::default(url.0.clone()); let file_path: Result<PathBuf, ()> = url.to_file_path(); match file_path { Ok(file_path) => { @@ -65,17 +65,19 @@ pub fn factory(load_data: LoadData, senders: LoadConsumer, classifier: Arc<MIMEC Ok(ReadStatus::EOF) | Err(_) => (res.map(|_| ()), start_sending(senders, metadata)), }; - progress_chan.send(Done(res)).unwrap(); + progress_chan.send(Done(SerializableStringResult(res))).unwrap(); } Err(e) => { let progress_chan = start_sending(senders, metadata); - progress_chan.send(Done(Err(e.description().to_string()))).unwrap(); + progress_chan.send(Done(SerializableStringResult(Err(e.description() + .to_string())))) + .unwrap(); } } } Err(_) => { let progress_chan = start_sending(senders, metadata); - progress_chan.send(Done(Err(url.to_string()))).unwrap(); + progress_chan.send(Done(SerializableStringResult(Err(url.to_string())))).unwrap(); } } }); |