aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/data_loader.rs
diff options
context:
space:
mode:
authorSean McArthur <sean.monstar@gmail.com>2014-11-14 11:57:32 -0800
committerManish Goregaokar <manishsmail@gmail.com>2014-12-04 10:06:39 -0800
commit12727d4dd0a93c7ab8139c8ae6893a1ec3b5edaf (patch)
tree31cbc8e8cfbbf7e95b6c9878f9589eaf63add8d1 /components/net/data_loader.rs
parent92a8c7a80ccd5721884da96dbd28c6c40ba32b70 (diff)
downloadservo-12727d4dd0a93c7ab8139c8ae6893a1ec3b5edaf.tar.gz
servo-12727d4dd0a93c7ab8139c8ae6893a1ec3b5edaf.zip
convert net crate to use hyper
Diffstat (limited to 'components/net/data_loader.rs')
-rw-r--r--components/net/data_loader.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/components/net/data_loader.rs b/components/net/data_loader.rs
index 33e2651512b..8f9f551f5dc 100644
--- a/components/net/data_loader.rs
+++ b/components/net/data_loader.rs
@@ -6,8 +6,7 @@ use resource_task::{Done, Payload, Metadata, LoadData, TargetedLoadResponse, sta
use serialize::base64::FromBase64;
-use http::headers::test_utils::from_stream_with_str;
-use http::headers::content_type::MediaType;
+use hyper::mime::Mime;
use url::{percent_decode, NonRelativeSchemeData};
@@ -59,8 +58,8 @@ fn load(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) {
// Parse the content type using rust-http.
// FIXME: this can go into an infinite loop! (rust-http #25)
- let content_type: Option<MediaType> = from_stream_with_str(ct_str);
- metadata.set_content_type(&content_type);
+ let content_type: Option<Mime> = from_str(ct_str);
+ metadata.set_content_type(content_type.as_ref());
let progress_chan = start_sending(senders, metadata);
let bytes = percent_decode(parts[1].as_bytes());