1 files changed, 28 insertions, 18 deletions
diff --git a/components/script/dom/testbindingiterable.rs b/components/script/dom/testbindingiterable.rs
index d89d7345f91..5befaaa2c59 100644
--- a/components/script/dom/testbindingiterable.rs
+++ b/components/script/dom/testbindingiterable.rs
@@ -1,41 +1,51 @@
 /* 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::TestBindingIterableBinding::{self, TestBindingIterableMethods};
-use dom::bindings::error::Fallible;
-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::TestBindingIterableBinding::TestBindingIterableMethods;
+use crate::dom::bindings::error::Fallible;
+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 TestBindingIterable {
     reflector: Reflector,
-    vals: DOMRefCell<Vec<DOMString>>,
+    vals: DomRefCell<Vec<DOMString>>,
 }
 
 impl TestBindingIterable {
-    fn new(global: &GlobalScope) -> Root<TestBindingIterable> {
-        reflect_dom_object(box TestBindingIterable {
-            reflector: Reflector::new(),
-            vals: DOMRefCell::new(vec![]),
-        }, global, TestBindingIterableBinding::Wrap)
+    fn new(global: &GlobalScope) -> DomRoot<TestBindingIterable> {
+        reflect_dom_object(
+            Box::new(TestBindingIterable {
+                reflector: Reflector::new(),
+                vals: DomRefCell::new(vec![]),
+            }),
+            global,
+        )
     }
 
-    pub fn Constructor(global: &GlobalScope) -> Fallible<Root<TestBindingIterable>> {
+    #[allow(non_snake_case)]
+    pub fn Constructor(global: &GlobalScope) -> Fallible<DomRoot<TestBindingIterable>> {
         Ok(TestBindingIterable::new(global))
     }
 }
 
 impl TestBindingIterableMethods for TestBindingIterable {
-    fn Add(&self, v: DOMString) { self.vals.borrow_mut().push(v); }
-    fn Length(&self) -> u32 { self.vals.borrow().len() as u32 }
-    fn GetItem(&self, n: u32) -> DOMString { self.IndexedGetter(n).unwrap_or_default() }
+    fn Add(&self, v: DOMString) {
+        self.vals.borrow_mut().push(v);
+    }
+    fn Length(&self) -> u32 {
+        self.vals.borrow().len() as u32
+    }
+    fn GetItem(&self, n: u32) -> DOMString {
+        self.IndexedGetter(n).unwrap_or_default()
+    }
     fn IndexedGetter(&self, n: u32) -> Option<DOMString> {
         self.vals.borrow().get(n as usize).cloned()
     }