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, 2 insertions, 2 deletions

diff --git a/components/script/fetch.rs b/components/script/fetch.rs
index 740099344bf..70a92910caa 100644
--- a/components/script/fetch.rs
+++ b/components/script/fetch.rs
@@ -24,10 +24,10 @@ use net_traits::CoreResourceMsg::Fetch as NetTraitsFetch;
 use net_traits::request::Request as NetTraitsRequest;
 use net_traits::request::RequestInit as NetTraitsRequestInit;
 use network_listener::{NetworkListener, PreInvoke};
+use servo_url::ServoUrl;
 use std::mem;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
-use url::Url;
 
 struct FetchContext {
     fetch_promise: Option<TrustedPromise>,
@@ -35,7 +35,7 @@ struct FetchContext {
     body: Vec<u8>,
 }
 
-fn from_referrer_to_referrer_url(request: &NetTraitsRequest) -> Option<Url> {
+fn from_referrer_to_referrer_url(request: &NetTraitsRequest) -> Option<ServoUrl> {
     let referrer = request.referrer.borrow();
     referrer.to_url().map(|url| url.clone())
 }