From 3e031bdaf8da146bbc0e2bca6db0edca75c20d0c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 6 Dec 2014 15:39:45 +0100 Subject: Make parse_html's base_url argument non-optional. It turns out the case where it woul be None can't happen. --- components/script/parse/html.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/parse/html.rs') diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index 5f34c87d3da..f78949d924c 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -163,9 +163,9 @@ impl<'a> TreeSink for servohtmlparser::Sink { pub fn parse_html(document: JSRef, input: HTMLInput, - base_url: Option, + base_url: Url, load_response: Option) { - let parser = ServoHTMLParser::new(base_url.clone(), document).root(); + let parser = ServoHTMLParser::new(Some(base_url.clone()), document).root(); let parser: JSRef = *parser; task_state::enter(IN_HTML_PARSER); @@ -178,7 +178,7 @@ pub fn parse_html(document: JSRef, let load_response = load_response.unwrap(); match load_response.metadata.content_type { Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => { - let page = format!("

", base_url.as_ref().unwrap().serialize()); + let page = format!("

", base_url.serialize()); parser.parse_chunk(page); }, _ => { -- cgit v1.2.3