1 files changed, 54 insertions, 52 deletions

diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs
index 170a979d996..129f96dc910 100644
--- a/components/script/dom/errorevent.rs
+++ b/components/script/dom/errorevent.rs
@@ -1,33 +1,35 @@
 /* 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/. */
-
-use dom::bindings::cell::DOMRefCell;
-use dom::bindings::codegen::Bindings::ErrorEventBinding;
-use dom::bindings::codegen::Bindings::ErrorEventBinding::ErrorEventMethods;
-use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
-use dom::bindings::error::Fallible;
-use dom::bindings::inheritance::Castable;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::reflect_dom_object;
-use dom::bindings::str::DOMString;
-use dom::bindings::trace::RootedTraceableBox;
-use dom::event::{Event, EventBubbles, EventCancelable};
-use dom::globalscope::GlobalScope;
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::cell::DomRefCell;
+use crate::dom::bindings::codegen::Bindings::ErrorEventBinding;
+use crate::dom::bindings::codegen::Bindings::ErrorEventBinding::ErrorEventMethods;
+use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::reflector::reflect_dom_object;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::bindings::trace::RootedTraceableBox;
+use crate::dom::event::{Event, EventBubbles, EventCancelable};
+use crate::dom::globalscope::GlobalScope;
+use crate::script_runtime::JSContext;
 use dom_struct::dom_struct;
-use js::jsapi::{Heap, HandleValue, JSContext};
+use js::jsapi::Heap;
 use js::jsval::JSVal;
+use js::rust::HandleValue;
 use servo_atoms::Atom;
 use std::cell::Cell;
 
 #[dom_struct]
 pub struct ErrorEvent {
     event: Event,
-    message: DOMRefCell<DOMString>,
-    filename: DOMRefCell<DOMString>,
+    message: DomRefCell<DOMString>,
+    filename: DomRefCell<DOMString>,
     lineno: Cell<u32>,
     colno: Cell<u32>,
-    #[ignore_heap_size_of = "Defined in rust-mozjs"]
+    #[ignore_malloc_size_of = "Defined in rust-mozjs"]
     error: Heap<JSVal>,
 }
 
@@ -35,34 +37,33 @@ impl ErrorEvent {
     fn new_inherited() -> ErrorEvent {
         ErrorEvent {
             event: Event::new_inherited(),
-            message: DOMRefCell::new(DOMString::new()),
-            filename: DOMRefCell::new(DOMString::new()),
+            message: DomRefCell::new(DOMString::new()),
+            filename: DomRefCell::new(DOMString::new()),
             lineno: Cell::new(0),
             colno: Cell::new(0),
-            error: Heap::default()
+            error: Heap::default(),
         }
     }
 
-    pub fn new_uninitialized(global: &GlobalScope) -> Root<ErrorEvent> {
-        reflect_dom_object(box ErrorEvent::new_inherited(),
-                           global,
-                           ErrorEventBinding::Wrap)
+    pub fn new_uninitialized(global: &GlobalScope) -> DomRoot<ErrorEvent> {
+        reflect_dom_object(Box::new(ErrorEvent::new_inherited()), global)
     }
 
-    pub fn new(global: &GlobalScope,
-               type_: Atom,
-               bubbles: EventBubbles,
-               cancelable: EventCancelable,
-               message: DOMString,
-               filename: DOMString,
-               lineno: u32,
-               colno: u32,
-               error: HandleValue) -> Root<ErrorEvent> {
+    pub fn new(
+        global: &GlobalScope,
+        type_: Atom,
+        bubbles: EventBubbles,
+        cancelable: EventCancelable,
+        message: DOMString,
+        filename: DOMString,
+        lineno: u32,
+        colno: u32,
+        error: HandleValue,
+    ) -> DomRoot<ErrorEvent> {
         let ev = ErrorEvent::new_uninitialized(global);
         {
             let event = ev.upcast::<Event>();
-            event.init_event(type_, bool::from(bubbles),
-                             bool::from(cancelable));
+            event.init_event(type_, bool::from(bubbles), bool::from(cancelable));
             *ev.message.borrow_mut() = message;
             *ev.filename.borrow_mut() = filename;
             ev.lineno.set(lineno);
@@ -72,10 +73,12 @@ impl ErrorEvent {
         ev
     }
 
-    pub fn Constructor(global: &GlobalScope,
-                       type_: DOMString,
-                       init: RootedTraceableBox<ErrorEventBinding::ErrorEventInit>)
-                       -> Fallible<Root<ErrorEvent>>{
+    #[allow(non_snake_case)]
+    pub fn Constructor(
+        global: &GlobalScope,
+        type_: DOMString,
+        init: RootedTraceableBox<ErrorEventBinding::ErrorEventInit>,
+    ) -> Fallible<DomRoot<ErrorEvent>> {
         let msg = match init.message.as_ref() {
             Some(message) => message.clone(),
             None => DOMString::new(),
@@ -95,18 +98,18 @@ impl ErrorEvent {
         let cancelable = EventCancelable::from(init.parent.cancelable);
 
         let event = ErrorEvent::new(
-                global,
-                Atom::from(type_),
-                bubbles,
-                cancelable,
-                msg,
-                file_name,
-                line_num,
-                col_num,
-                init.error.handle());
+            global,
+            Atom::from(type_),
+            bubbles,
+            cancelable,
+            msg,
+            file_name,
+            line_num,
+            col_num,
+            init.error.handle(),
+        );
         Ok(event)
     }
-
 }
 
 impl ErrorEventMethods for ErrorEvent {
@@ -130,9 +133,8 @@ impl ErrorEventMethods for ErrorEvent {
         self.filename.borrow().clone()
     }
 
-    #[allow(unsafe_code)]
     // https://html.spec.whatwg.org/multipage/#dom-errorevent-error
-    unsafe fn Error(&self, _cx: *mut JSContext) -> JSVal {
+    fn Error(&self, _cx: JSContext) -> JSVal {
         self.error.get()
     }