Cleanup last_loaded_url/last_url handling in ScriptTask::load.

1 files changed, 5 insertions, 8 deletions

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 7972b2a378a..5a8caadb3e6 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -693,20 +693,17 @@ impl ScriptTask {
             message for a layout channel that is not associated with this script task. This
             is a bug.");
 
-        let last_loaded_url = replace(&mut *page.mut_url(), None);
-        match last_loaded_url {
-            Some((ref loaded, needs_reflow)) if *loaded == url => {
-                *page.mut_url() = Some((loaded.clone(), false));
-                if needs_reflow {
+        let last_url = match &mut *page.mut_url() {
+            &Some((ref mut loaded, ref mut needs_reflow)) if *loaded == url => {
+                if replace(needs_reflow, false) {
                     self.force_reflow(&*page);
                 }
                 return;
             },
-            _ => (),
-        }
+            url => replace(url, None).map(|(loaded, _)| loaded),
+        };
 
         let is_javascript = url.scheme.as_slice() == "javascript";
-        let last_url = last_loaded_url.map(|(ref loaded, _)| loaded.clone());
 
         let cx = self.js_context.borrow();
         let cx = cx.as_ref().unwrap();