Auto merge of #14246 - emilio:servo-url, r=SimonSapin

Urlmageddon

<!-- Please describe your changes on the following line: -->

Still needs a bunch of code in net to be converted in order to get more
advantage of this for images and stuff, but meanwhile this should help quite a
bit with #13778.

Still wanted to get this in.

r? @SimonSapin

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14246)
<!-- Reviewable:end -->

1 files changed, 3 insertions, 3 deletions

diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index 331f0fbbf8c..a0de437d02f 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -36,7 +36,7 @@ use net_traits::IpcSend;
 use script_thread::Documents;
 use script_traits::webdriver_msg::{WebDriverFrameId, WebDriverJSError, WebDriverJSResult, WebDriverJSValue};
 use script_traits::webdriver_msg::WebDriverCookieError;
-use url::Url;
+use servo_url::ServoUrl;
 
 fn find_node_by_unique_id(documents: &Documents,
                           pipeline: PipelineId,
@@ -361,11 +361,11 @@ pub fn handle_get_css(documents: &Documents,
 
 pub fn handle_get_url(documents: &Documents,
                       pipeline: PipelineId,
-                      reply: IpcSender<Url>) {
+                      reply: IpcSender<ServoUrl>) {
     // TODO: Return an error if the pipeline doesn't exist.
     let url = documents.find_document(pipeline)
         .map(|document| document.url().clone())
-        .unwrap_or_else(|| Url::parse("about:blank").expect("infallible"));
+        .unwrap_or_else(|| ServoUrl::parse("about:blank").expect("infallible"));
     reply.send(url).unwrap();
 }