1 files changed, 34 insertions, 19 deletions

diff --git a/components/script/dom/testbindingpairiterable.rs b/components/script/dom/testbindingpairiterable.rs
index c31d0e34fb5..e8775af5ce7 100644
--- a/components/script/dom/testbindingpairiterable.rs
+++ b/components/script/dom/testbindingpairiterable.rs
@@ -1,24 +1,23 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // check-tidy: no specs after this line
 
-use dom::bindings::cell::DOMRefCell;
-use dom::bindings::codegen::Bindings::TestBindingPairIterableBinding;
-use dom::bindings::codegen::Bindings::TestBindingPairIterableBinding::TestBindingPairIterableMethods;
-use dom::bindings::error::Fallible;
-use dom::bindings::iterable::Iterable;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::bindings::str::DOMString;
-use dom::globalscope::GlobalScope;
+use crate::dom::bindings::cell::DomRefCell;
+use crate::dom::bindings::codegen::Bindings::TestBindingPairIterableBinding::TestBindingPairIterableMethods;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::iterable::Iterable;
+use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
 use dom_struct::dom_struct;
 
 #[dom_struct]
 pub struct TestBindingPairIterable {
     reflector: Reflector,
-    map: DOMRefCell<Vec<(DOMString, u32)>>,
+    map: DomRefCell<Vec<(DOMString, u32)>>,
 }
 
 impl Iterable for TestBindingPairIterable {
@@ -28,22 +27,38 @@ impl Iterable for TestBindingPairIterable {
         self.map.borrow().len() as u32
     }
     fn get_value_at_index(&self, index: u32) -> u32 {
-        self.map.borrow().iter().nth(index as usize).map(|a| &a.1).unwrap().clone()
+        self.map
+            .borrow()
+            .iter()
+            .nth(index as usize)
+            .map(|a| &a.1)
+            .unwrap()
+            .clone()
     }
     fn get_key_at_index(&self, index: u32) -> DOMString {
-        self.map.borrow().iter().nth(index as usize).map(|a| &a.0).unwrap().clone()
+        self.map
+            .borrow()
+            .iter()
+            .nth(index as usize)
+            .map(|a| &a.0)
+            .unwrap()
+            .clone()
     }
 }
 
 impl TestBindingPairIterable {
-    fn new(global: &GlobalScope) -> Root<TestBindingPairIterable> {
-        reflect_dom_object(box TestBindingPairIterable {
-            reflector: Reflector::new(),
-            map: DOMRefCell::new(vec![]),
-        }, global, TestBindingPairIterableBinding::TestBindingPairIterableWrap)
+    fn new(global: &GlobalScope) -> DomRoot<TestBindingPairIterable> {
+        reflect_dom_object(
+            Box::new(TestBindingPairIterable {
+                reflector: Reflector::new(),
+                map: DomRefCell::new(vec![]),
+            }),
+            global,
+        )
     }
 
-    pub fn Constructor(global: &GlobalScope) -> Fallible<Root<TestBindingPairIterable>> {
+    #[allow(non_snake_case)]
+    pub fn Constructor(global: &GlobalScope) -> Fallible<DomRoot<TestBindingPairIterable>> {
         Ok(TestBindingPairIterable::new(global))
     }
 }