Used rust-url directly instead of servo_util::url

The latter now only calls the former.

1 files changed, 22 insertions, 20 deletions

diff --git a/src/components/net/image_cache_task.rs b/src/components/net/image_cache_task.rs
index 6bd719f316c..c70ebc3ebeb 100644
--- a/src/components/net/image_cache_task.rs
+++ b/src/components/net/image_cache_task.rs
@@ -493,8 +493,8 @@ mod tests {
     use resource_task;
     use resource_task::{ResourceTask, Metadata, start_sending};
     use image::base::test_image_bin;
-    use servo_util::url::parse_url;
     use std::comm;
+    use url::Url;
 
     trait Closure {
         fn invoke(&self, _response: Sender<resource_task::ProgressMsg>) { }
@@ -567,7 +567,8 @@ mod tests {
             loop {
                 match port.recv() {
                     resource_task::Load(_, response) => {
-                        let chan = start_sending(response, Metadata::default(parse_url("file:///fake", None)));
+                        let chan = start_sending(response, Metadata::default(
+                            Url::parse("file:///fake").unwrap()));
                         on_load.invoke(chan);
                     }
                     resource_task::Exit => break
@@ -581,7 +582,6 @@ mod tests {
         let mock_resource_task = mock_resource_task(box DoesNothing);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let _url = parse_url("file", None);
 
         image_cache_task.exit();
         mock_resource_task.send(resource_task::Exit);
@@ -593,7 +593,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box DoesNothing);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         let (chan, port) = channel();
         image_cache_task.send(GetImage(url, chan));
@@ -607,7 +607,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box JustSendOK { url_requested_chan: url_requested_chan});
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url));
         url_requested.recv();
@@ -622,7 +622,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box JustSendOK { url_requested_chan: url_requested_chan});
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url.clone()));
         image_cache_task.send(Prefetch(url));
@@ -642,7 +642,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box WaitSendTestImage{wait_port: wait_port});
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url.clone()));
         image_cache_task.send(Decode(url.clone()));
@@ -659,7 +659,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box SendTestImage);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         let join_port = image_cache_task.wait_for_store();
 
@@ -685,7 +685,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box SendTestImage);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         let join_port = image_cache_task.wait_for_store();
 
@@ -718,7 +718,8 @@ mod tests {
             loop {
                 match port.recv() {
                     resource_task::Load(_, response) => {
-                        let chan = start_sending(response, Metadata::default(parse_url("file:///fake", None)));
+                        let chan = start_sending(response, Metadata::default(
+                            Url::parse("file:///fake").unwrap()));
                         chan.send(resource_task::Payload(test_image_bin()));
                         chan.send(resource_task::Done(Ok(())));
                         image_bin_sent_chan.send(());
@@ -732,7 +733,7 @@ mod tests {
         });
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url.clone()));
 
@@ -764,7 +765,8 @@ mod tests {
             loop {
                 match port.recv() {
                     resource_task::Load(_, response) => {
-                        let chan = start_sending(response, Metadata::default(parse_url("file:///fake", None)));
+                        let chan = start_sending(response, Metadata::default(
+                            Url::parse("file:///fake").unwrap()));
                         chan.send(resource_task::Payload(test_image_bin()));
                         chan.send(resource_task::Done(Err("".to_string())));
                         image_bin_sent_chan.send(());
@@ -778,7 +780,7 @@ mod tests {
         });
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url.clone()));
         image_cache_task.send(Decode(url.clone()));
@@ -807,7 +809,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box SendTestImageErr);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         let join_port = image_cache_task.wait_for_store_prefetched();
 
@@ -833,7 +835,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box SendTestImageErr);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         let join_port = image_cache_task.wait_for_store_prefetched();
 
@@ -867,7 +869,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box SendBogusImage);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         let join_port = image_cache_task.wait_for_store();
 
@@ -895,7 +897,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box SendTestImage);
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         let join_port = image_cache_task.wait_for_store();
 
@@ -923,7 +925,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box WaitSendTestImage {wait_port: wait_port});
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url.clone()));
         image_cache_task.send(Decode(url.clone()));
@@ -949,7 +951,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box WaitSendTestImageErr{wait_port: wait_port});
 
         let image_cache_task = ImageCacheTask::new(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url.clone()));
         image_cache_task.send(Decode(url.clone()));
@@ -973,7 +975,7 @@ mod tests {
         let mock_resource_task = mock_resource_task(box SendTestImage);
 
         let image_cache_task = ImageCacheTask::new_sync(mock_resource_task.clone());
-        let url = parse_url("file", None);
+        let url = Url::parse("file:///").unwrap();
 
         image_cache_task.send(Prefetch(url.clone()));
         image_cache_task.send(Decode(url.clone()));