From 31f8100b9dd69e3301a7b049f160dc25ef3915c4 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 4 Oct 2014 15:10:42 +0200 Subject: [PATCH] Cleanup URL handling in ScriptTask::load a bit. This should make it clearer that we always pass a URL to Document::new, and avoids an unnecessary unwrap() call. --- components/script/script_task.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/script/script_task.rs b/components/script/script_task.rs index f6a0fdb332b..b2ba9e63473 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -732,16 +732,16 @@ impl ScriptTask { self.compositor.dup(), self.image_cache_task.clone()).root(); let doc_url = if is_javascript { - let doc_url = match last_url { - Some(url) => Some(url.clone()), - None => Url::parse("about:blank").ok(), - }; - *page.mut_url() = Some((doc_url.as_ref().unwrap().clone(), true)); + let doc_url = last_url.unwrap_or_else(|| { + Url::parse("about:blank").unwrap() + }); + *page.mut_url() = Some((doc_url.clone(), true)); doc_url } else { - Some(url.clone()) + url.clone() }; - let document = Document::new(*window, doc_url, HTMLDocument, None).root(); + let document = Document::new(*window, Some(doc_url), HTMLDocument, + None).root(); window.deref().init_browser_context(*document);