aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/js.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-12-06 18:31:46 -0800
committerGitHub <noreply@github.com>2016-12-06 18:31:46 -0800
commit32c121b6ff4a3f9336e742ecf1a96b187986fde0 (patch)
tree678963322c292d39a286a78f299def638d6c2c17 /components/script/dom/bindings/js.rs
parentb54cfc9f259e72ea26e68ec8a7b1d617cf0812d3 (diff)
parent535765907d667466636e0fcaa9a7c6a078cf397d (diff)
downloadservo-32c121b6ff4a3f9336e742ecf1a96b187986fde0.tar.gz
servo-32c121b6ff4a3f9336e742ecf1a96b187986fde0.zip
Auto merge of #14473 - nox:raf-safety, r=Ms2ger
Clean up JSTraceable and how we use it <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14473) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/js.rs')
-rw-r--r--components/script/dom/bindings/js.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index 528b1213ccb..9ddf3fc46fc 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -105,10 +105,10 @@ impl<T: Reflectable> Deref for JS<T> {
}
}
-impl<T: Reflectable> JSTraceable for JS<T> {
- fn trace(&self, trc: *mut JSTracer) {
+unsafe impl<T: Reflectable> JSTraceable for JS<T> {
+ unsafe fn trace(&self, trc: *mut JSTracer) {
#[cfg(debug_assertions)]
- let trace_str = format!("for {} on heap", unsafe { type_name::<T>() });
+ let trace_str = format!("for {} on heap", type_name::<T>());
#[cfg(debug_assertions)]
let trace_info = &trace_str[..];
#[cfg(not(debug_assertions))]
@@ -116,7 +116,7 @@ impl<T: Reflectable> JSTraceable for JS<T> {
trace_reflector(trc,
trace_info,
- unsafe { (**self.ptr).reflector() });
+ (**self.ptr).reflector());
}
}