Eliminate warnings

10 files changed, 44 insertions, 42 deletions

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 42a9a09d7fc..383595248c3 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -1798,7 +1798,7 @@ let obj = with_compartment(aCx, proto, || {
   NewProxyObject(aCx, handler,
                  &private,
                  proto, %s,
-                 ptr::mut_null(), ptr::mut_null())
+                 ptr::null_mut(), ptr::null_mut())
 });
 assert!(obj.is_not_null());
 
@@ -3666,7 +3666,7 @@ if expando.is_not_null() {
   }
 }
 """ + namedGet + """
-(*desc).obj = ptr::mut_null();
+(*desc).obj = ptr::null_mut();
 return true;"""
 
     def definition_body(self):
@@ -4303,11 +4303,11 @@ class CGDictionary(CGThing):
         return string.Template(
             "impl<'a, 'b> ${selfName}<'a, 'b> {\n"
             "  pub fn empty() -> ${selfName}<'a, 'b> {\n"
-            "    ${selfName}::new(ptr::mut_null(), NullValue()).unwrap()\n"
+            "    ${selfName}::new(ptr::null_mut(), NullValue()).unwrap()\n"
             "  }\n"
             "  pub fn new(cx: *mut JSContext, val: JSVal) -> Result<${selfName}<'a, 'b>, ()> {\n"
             "    let object = if val.is_null_or_undefined() {\n"
-            "        ptr::mut_null()\n"
+            "        ptr::null_mut()\n"
             "    } else if val.is_object() {\n"
             "        val.to_object()\n"
             "    } else {\n"
@@ -4914,7 +4914,7 @@ class CGCallback(CGClass):
         # the private method.
         argnames = [arg.name for arg in args]
         argnamesWithThis = ["s.GetContext()", "thisObjJS"] + argnames
-        argnamesWithoutThis = ["s.GetContext()", "ptr::mut_null()"] + argnames
+        argnamesWithoutThis = ["s.GetContext()", "ptr::null_mut()"] + argnames
         # Now that we've recorded the argnames for our call to our private
         # method, insert our optional argument for deciding whether the
         # CallSetup should re-throw exceptions on aRv.
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 1b69970b582..a923371ae8e 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -660,7 +660,7 @@ pub extern fn outerize_global(_cx: *mut JSContext, obj: JSHandleObject) -> *mut
                              IDLInterface::get_prototype_depth(None::<window::Window>))
             .unwrap()
             .root();
-        win.deref().browser_context.deref().borrow().get_ref().window_proxy()
+        win.deref().browser_context.deref().borrow().as_ref().unwrap().window_proxy()
     }
 }
 
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 435b618c153..c9ac5e2f040 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -53,11 +53,11 @@ impl BrowserContext {
         let page = win.deref().page();
         let js_info = page.js_info();
 
-        let handler = js_info.get_ref().dom_static.windowproxy_handler;
+        let handler = js_info.as_ref().unwrap().dom_static.windowproxy_handler;
         assert!(handler.deref().is_not_null());
 
         let parent = win.deref().reflector().get_jsobject();
-        let cx = js_info.get_ref().js_context.deref().deref().ptr;
+        let cx = js_info.as_ref().unwrap().js_context.deref().deref().ptr;
         let wrapper = with_compartment(cx, parent, || unsafe {
             WrapperNew(cx, parent, *handler.deref())
         });
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index b6971f5dd14..265131f00f0 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -356,12 +356,14 @@ impl<'a> PrivateDocumentHelpers for JSRef<'a, Document> {
     }
 
     fn get_html_element(self) -> Option<Temporary<HTMLHtmlElement>> {
-        self.GetDocumentElement().root().filtered(|root| {
-            let root: JSRef<Node> = NodeCast::from_ref(**root);
-            root.type_id() == ElementNodeTypeId(HTMLHtmlElementTypeId)
-        }).map(|elem| {
-            Temporary::from_rooted(HTMLHtmlElementCast::to_ref(*elem).unwrap())
-        })
+        match self.GetDocumentElement().root() {
+            Some(ref root) if {
+                let root: JSRef<Node> = NodeCast::from_ref(**root);
+                root.type_id() == ElementNodeTypeId(HTMLHtmlElementTypeId)
+            } => Some(Temporary::from_rooted(HTMLHtmlElementCast::to_ref(**root).unwrap())),
+
+            _ => None,
+        }
     }
 }
 
@@ -371,7 +373,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
         if self.implementation.get().is_none() {
             self.implementation.assign(Some(DOMImplementation::new(self)));
         }
-        Temporary::new(self.implementation.get().get_ref().clone())
+        Temporary::new(self.implementation.get().as_ref().unwrap().clone())
     }
 
     // http://dom.spec.whatwg.org/#dom-document-url
@@ -751,7 +753,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let filter = box ImagesFilter;
             self.images.assign(Some(HTMLCollection::create(*window, root, filter)));
         }
-        Temporary::new(self.images.get().get_ref().clone())
+        Temporary::new(self.images.get().as_ref().unwrap().clone())
     }
 
     fn Embeds(self) -> Temporary<HTMLCollection> {
@@ -761,7 +763,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let filter = box EmbedsFilter;
             self.embeds.assign(Some(HTMLCollection::create(*window, root, filter)));
         }
-        Temporary::new(self.embeds.get().get_ref().clone())
+        Temporary::new(self.embeds.get().as_ref().unwrap().clone())
     }
 
     fn Plugins(self) -> Temporary<HTMLCollection> {
@@ -775,7 +777,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let filter = box LinksFilter;
             self.links.assign(Some(HTMLCollection::create(*window, root, filter)));
         }
-        Temporary::new(self.links.get().get_ref().clone())
+        Temporary::new(self.links.get().as_ref().unwrap().clone())
     }
 
     fn Forms(self) -> Temporary<HTMLCollection> {
@@ -785,7 +787,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let filter = box FormsFilter;
             self.forms.assign(Some(HTMLCollection::create(*window, root, filter)));
         }
-        Temporary::new(self.forms.get().get_ref().clone())
+        Temporary::new(self.forms.get().as_ref().unwrap().clone())
     }
 
     fn Scripts(self) -> Temporary<HTMLCollection> {
@@ -795,7 +797,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let filter = box ScriptsFilter;
             self.scripts.assign(Some(HTMLCollection::create(*window, root, filter)));
         }
-        Temporary::new(self.scripts.get().get_ref().clone())
+        Temporary::new(self.scripts.get().as_ref().unwrap().clone())
     }
 
     fn Anchors(self) -> Temporary<HTMLCollection> {
@@ -805,7 +807,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let filter = box AnchorsFilter;
             self.anchors.assign(Some(HTMLCollection::create(*window, root, filter)));
         }
-        Temporary::new(self.anchors.get().get_ref().clone())
+        Temporary::new(self.anchors.get().as_ref().unwrap().clone())
     }
 
     fn Applets(self) -> Temporary<HTMLCollection> {
@@ -816,7 +818,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let filter = box AppletsFilter;
             self.applets.assign(Some(HTMLCollection::create(*window, root, filter)));
         }
-        Temporary::new(self.applets.get().get_ref().clone())
+        Temporary::new(self.applets.get().as_ref().unwrap().clone())
     }
 
     fn Location(self) -> Temporary<Location> {
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 21c0127fde1..ee0abd3a3ac 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -581,7 +581,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
         let window = doc.deref().window.root();
         let list = NamedNodeMap::new(*window, self);
         self.attr_list.assign(Some(list));
-        Temporary::new(self.attr_list.get().get_ref().clone())
+        Temporary::new(self.attr_list.get().as_ref().unwrap().clone())
     }
 
     // http://dom.spec.whatwg.org/#dom-element-getattribute
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 823304d6d8a..62404fe4004 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -254,7 +254,7 @@ impl<'a> EventTargetMethods for JSRef<'a, EventTarget> {
             Some(listener) => {
                 let mut handlers = self.handlers.deref().borrow_mut();
                 let mut entry = handlers.find_mut(&ty);
-                for entry in entry.mut_iter() {
+                for entry in entry.iter_mut() {
                     let phase = if capture { Capturing } else { Bubbling };
                     let old_entry = EventListenerEntry {
                         phase: phase,
diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs
index 4374a55067e..4a023505244 100644
--- a/components/script/dom/formdata.rs
+++ b/components/script/dom/formdata.rs
@@ -73,7 +73,7 @@ impl<'a> FormDataMethods for JSRef<'a, FormData> {
 
     fn Get(self, name: DOMString) -> Option<FileOrString> {
         if self.data.deref().borrow().contains_key_equiv(&name) {
-            match self.data.deref().borrow().get(&name)[0].clone() {
+            match (*self.data.deref().borrow())[name][0].clone() {
                 StringData(ref s) => Some(eString(s.clone())),
                 FileData(ref f) => {
                     Some(eFile(f.clone()))
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index bcd613c753b..40b3aa57085 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -657,7 +657,7 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
     }
 
     fn owner_doc(&self) -> Temporary<Document> {
-        Temporary::new(self.owner_doc.get().get_ref().clone())
+        Temporary::new(self.owner_doc.get().as_ref().unwrap().clone())
     }
 
     fn set_owner_doc(&self, document: JSRef<Document>) {
@@ -869,7 +869,7 @@ impl<'a> Iterator<JSRef<'a, Node>> for AncestorIterator<'a> {
         }
 
         // FIXME: Do we need two clones here?
-        let x = self.current.get_ref().clone();
+        let x = self.current.as_ref().unwrap().clone();
         self.current = x.parent_node().map(|node| (*node.root()).clone());
         Some(x)
     }
@@ -1236,7 +1236,7 @@ impl Node {
 
         // Step 7: mutation records.
         // Step 8.
-        for node in nodes.mut_iter() {
+        for node in nodes.iter_mut() {
             parent.add_child(*node, child);
             let is_in_doc = parent.is_in_doc();
             for kid in node.traverse_preorder() {
@@ -1571,7 +1571,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
         let window = doc.deref().window.root();
         let child_list = NodeList::new_child_list(*window, self);
         self.child_list.assign(Some(child_list));
-        Temporary::new(self.child_list.get().get_ref().clone())
+        Temporary::new(self.child_list.get().as_ref().unwrap().clone())
     }
 
     // http://dom.spec.whatwg.org/#dom-node-firstchild
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 50d78ad8208..371e33d4588 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -98,7 +98,7 @@ pub struct Window {
 impl Window {
     pub fn get_cx(&self) -> *mut JSContext {
         let js_info = self.page().js_info();
-        (**js_info.get_ref().js_context).ptr
+        (**js_info.as_ref().unwrap().js_context).ptr
     }
 
     pub fn page<'a>(&'a self) -> &'a Page {
@@ -112,7 +112,7 @@ impl Window {
 #[unsafe_destructor]
 impl Drop for Window {
     fn drop(&mut self) {
-        for (_, timer_handle) in self.active_timers.borrow_mut().mut_iter() {
+        for (_, timer_handle) in self.active_timers.borrow_mut().iter_mut() {
             timer_handle.cancel();
         }
     }
@@ -215,7 +215,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
 
     fn Document(self) -> Temporary<Document> {
         let frame = self.page().frame();
-        Temporary::new(frame.get_ref().document.clone())
+        Temporary::new(frame.as_ref().unwrap().document.clone())
     }
 
     fn Location(self) -> Temporary<Location> {
@@ -224,7 +224,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
             let location = Location::new(self, page);
             self.location.assign(Some(location));
         }
-        Temporary::new(self.location.get().get_ref().clone())
+        Temporary::new(self.location.get().as_ref().unwrap().clone())
     }
 
     fn Console(self) -> Temporary<Console> {
@@ -232,7 +232,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
             let console = Console::new(&global::Window(self));
             self.console.assign(Some(console));
         }
-        Temporary::new(self.console.get().get_ref().clone())
+        Temporary::new(self.console.get().as_ref().unwrap().clone())
     }
 
     fn Navigator(self) -> Temporary<Navigator> {
@@ -240,7 +240,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
             let navigator = Navigator::new(self);
             self.navigator.assign(Some(navigator));
         }
-        Temporary::new(self.navigator.get().get_ref().clone())
+        Temporary::new(self.navigator.get().as_ref().unwrap().clone())
     }
 
     fn SetTimeout(self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32 {
@@ -288,7 +288,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
             let performance = Performance::new(self);
             self.performance.assign(Some(performance));
         }
-        Temporary::new(self.performance.get().get_ref().clone())
+        Temporary::new(self.performance.get().as_ref().unwrap().clone())
     }
 
     fn GetOnclick(self) -> Option<EventHandlerNonNull> {
@@ -336,7 +336,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
             let screen = Screen::new(self);
             self.screen.assign(Some(screen));
         }
-        Temporary::new(self.screen.get().get_ref().clone())
+        Temporary::new(self.screen.get().as_ref().unwrap().clone())
     }
 
     fn Debug(self, message: DOMString) {
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index b0df64f0b11..f5bb583fddb 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -88,12 +88,12 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
             let location = WorkerLocation::new(self, self.worker_url.deref().clone());
             self.location.assign(Some(location));
         }
-        Temporary::new(self.location.get().get_ref().clone())
+        Temporary::new(self.location.get().as_ref().unwrap().clone())
     }
 
     fn ImportScripts(self, url_strings: Vec<DOMString>) -> ErrorResult {
         let mut urls = Vec::with_capacity(url_strings.len());
-        for url in url_strings.move_iter() {
+        for url in url_strings.into_iter() {
             let url = UrlParser::new().base_url(&*self.worker_url)
                                       .parse(url.as_slice());
             match url {
@@ -102,7 +102,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
             };
         }
 
-        for url in urls.move_iter() {
+        for url in urls.into_iter() {
             let (url, source) = match load_whole_resource(&*self.resource_task, url) {
                 Err(_) => return Err(Network),
                 Ok((metadata, bytes)) => {
@@ -128,7 +128,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
             let navigator = WorkerNavigator::new(self);
             self.navigator.assign(Some(navigator));
         }
-        Temporary::new(self.navigator.get().get_ref().clone())
+        Temporary::new(self.navigator.get().as_ref().unwrap().clone())
     }
 
     fn Console(self) -> Temporary<Console> {
@@ -136,7 +136,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
             let console = Console::new(&global::Worker(self));
             self.console.assign(Some(console));
         }
-        Temporary::new(self.console.get().get_ref().clone())
+        Temporary::new(self.console.get().as_ref().unwrap().clone())
     }
 
     fn Btoa(self, btoa: DOMString) -> Fallible<DOMString> {