1 files changed, 10 insertions, 10 deletions

diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index b4c1322ed0c..292324f04d0 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -100,7 +100,7 @@ impl<T: DomObject> Deref for JS<T> {
         debug_assert!(thread_state::get().is_script());
         // We can only have &JS<T> from a rooted thing, so it's safe to deref
         // it to &T.
-        unsafe { &**self.ptr }
+        unsafe { &*self.ptr.get() }
     }
 }
 
@@ -115,7 +115,7 @@ unsafe impl<T: DomObject> JSTraceable for JS<T> {
 
         trace_reflector(trc,
                         trace_info,
-                        (**self.ptr).reflector());
+                        (*self.ptr.get()).reflector());
     }
 }
 
@@ -133,7 +133,7 @@ impl<T: Castable> LayoutJS<T> {
               T: DerivedFrom<U>
     {
         debug_assert!(thread_state::get().is_layout());
-        let ptr: *const T = *self.ptr;
+        let ptr: *const T = self.ptr.get();
         LayoutJS {
             ptr: unsafe { NonZero::new(ptr as *const U) },
         }
@@ -146,7 +146,7 @@ impl<T: Castable> LayoutJS<T> {
         debug_assert!(thread_state::get().is_layout());
         unsafe {
             if (*self.unsafe_get()).is::<U>() {
-                let ptr: *const T = *self.ptr;
+                let ptr: *const T = self.ptr.get();
                 Some(LayoutJS {
                     ptr: NonZero::new(ptr as *const U),
                 })
@@ -161,7 +161,7 @@ impl<T: DomObject> LayoutJS<T> {
     /// Get the reflector.
     pub unsafe fn get_jsobject(&self) -> *mut JSObject {
         debug_assert!(thread_state::get().is_layout());
-        (**self.ptr).reflector().get_jsobject().get()
+        (*self.ptr.get()).reflector().get_jsobject().get()
     }
 }
 
@@ -397,7 +397,7 @@ impl<T: DomObject> LayoutJS<T> {
     /// this is unsafe is what necessitates the layout wrappers.)
     pub unsafe fn unsafe_get(&self) -> *const T {
         debug_assert!(thread_state::get().is_layout());
-        *self.ptr
+        self.ptr.get()
     }
 
     /// Returns a reference to the interior of this JS object. This method is
@@ -405,7 +405,7 @@ impl<T: DomObject> LayoutJS<T> {
     /// mutate DOM nodes.
     pub fn get_for_script(&self) -> &T {
         debug_assert!(thread_state::get().is_script());
-        unsafe { &**self.ptr }
+        unsafe { &*self.ptr.get() }
     }
 }
 
@@ -544,7 +544,7 @@ impl<T: DomObject> Root<T> {
         debug_assert!(thread_state::get().is_script());
         STACK_ROOTS.with(|ref collection| {
             let RootCollectionPtr(collection) = collection.get().unwrap();
-            unsafe { (*collection).root(&*(**unrooted).reflector()) }
+            unsafe { (*collection).root(&*(*unrooted.get()).reflector()) }
             Root {
                 ptr: unrooted,
                 root_list: collection,
@@ -554,7 +554,7 @@ impl<T: DomObject> Root<T> {
 
     /// Generate a new root from a reference
     pub fn from_ref(unrooted: &T) -> Root<T> {
-        Root::new(unsafe { NonZero::new(&*unrooted) })
+        Root::new(unsafe { NonZero::new(unrooted) })
     }
 }
 
@@ -569,7 +569,7 @@ impl<T: DomObject> Deref for Root<T> {
     type Target = T;
     fn deref(&self) -> &T {
         debug_assert!(thread_state::get().is_script());
-        unsafe { &**self.ptr.deref() }
+        unsafe { &*self.ptr.get() }
     }
 }