Auto merge of #5855 - Manishearth:nomove, r=kmc,munksgaard

fixes #5724, #5737


uses https://github.com/Manishearth/rust-tenacious (can be moved in-tree if needed)

I can make it `Deny` by default too (I'll add a cargo feature to tenacious), though we might want it on
`Warn` until we get some mileage on it.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5855)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 5 deletions

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index f1f469212aa..0fbdf0f5926 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -900,7 +900,7 @@ impl ScriptTask {
         let doc = page.document().root();
         let frame_element = self.find_iframe(doc.r(), subpage_id).root();
 
-        if let Some(frame_element) = frame_element {
+        if let Some(ref frame_element) = frame_element {
             let element: JSRef<Element> = ElementCast::from_ref(frame_element.r());
             doc.r().begin_focus_transaction();
             doc.r().request_focus(element);
@@ -921,7 +921,7 @@ impl ScriptTask {
             self.find_iframe(doc.r(), subpage_id)
         }).root();
 
-        if let Some(frame_element) = frame_element {
+        if let Some(ref frame_element) = frame_element {
             frame_element.r().dispatch_mozbrowser_event(event);
         }
     }
@@ -937,7 +937,7 @@ impl ScriptTask {
             self.find_iframe(doc.r(), old_subpage_id)
         }).root();
 
-        frame_element.unwrap().r().update_subpage_id(new_subpage_id);
+        frame_element.r().unwrap().update_subpage_id(new_subpage_id);
     }
 
     /// Handles a notification that reflow completed.
@@ -1295,7 +1295,7 @@ impl ScriptTask {
         let page = get_page(&self.root_page(), pipeline_id);
         let document = page.document().root();
         match document.r().find_fragment_node(fragment).root() {
-            Some(node) => {
+            Some(ref node) => {
                 self.scroll_fragment_point(pipeline_id, node.r());
             }
             None => {}
@@ -1314,7 +1314,7 @@ impl ScriptTask {
                                       .and_then(|name| document.r().find_fragment_node(name))
                                       .root();
         match fragment_node {
-            Some(node) => self.scroll_fragment_point(pipeline_id, node.r()),
+            Some(ref node) => self.scroll_fragment_point(pipeline_id, node.r()),
             None => {}
         }