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/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs
index a2d636da6f3..ab5af05a18d 100644
--- a/components/script/dom/servoparser/html.rs
+++ b/components/script/dom/servoparser/html.rs
@@ -31,10 +31,10 @@ use html5ever::tree_builder::{NodeOrText, QuirksMode};
 use html5ever::tree_builder::{Tracer as HtmlTracer, TreeBuilder, TreeBuilderOpts, TreeSink};
 use html5ever_atoms::QualName;
 use js::jsapi::JSTracer;
+use servo_url::ServoUrl;
 use std::borrow::Cow;
 use std::io::{self, Write};
 use super::{FragmentContext, Sink};
-use url::Url;
 
 #[derive(HeapSizeOf, JSTraceable)]
 #[must_root]
@@ -48,7 +48,7 @@ pub struct Tokenizer {
 impl Tokenizer {
     pub fn new(
             document: &Document,
-            url: Url,
+            url: ServoUrl,
             fragment_context: Option<FragmentContext>)
             -> Self {
         let sink = Sink {