auto merge of #5387 : Manishearth/servo/macro_path, r=Ms2ger

2 files changed, 5 insertions, 5 deletions

diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs
index b1cba9ccd3e..42f23b8c4b2 100644
--- a/components/script/dom/macros.rs
+++ b/components/script/dom/macros.rs
@@ -169,18 +169,18 @@ macro_rules! make_uint_setter(
 macro_rules! no_jsmanaged_fields(
     ($($ty:ident),+) => (
         $(
-            impl JSTraceable for $ty {
+            impl $crate::dom::bindings::trace::JSTraceable for $ty {
                 #[inline]
-                fn trace(&self, _: *mut JSTracer) {
+                fn trace(&self, _: *mut ::js::jsapi::JSTracer) {
                     // Do nothing
                 }
             }
         )+
     );
     ($ty:ident<$($gen:ident),+>) => (
-        impl<$($gen),+> JSTraceable for $ty<$($gen),+> {
+        impl<$($gen),+> $crate::dom::bindings::trace::JSTraceable for $ty<$($gen),+> {
             #[inline]
-            fn trace(&self, _: *mut JSTracer) {
+            fn trace(&self, _: *mut ::js::jsapi::JSTracer) {
                 // Do nothing
             }
         }
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index de6c9964433..67bb5279f32 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -54,7 +54,7 @@ use selectors::matching::matches;
 use style::properties::ComputedValues;
 use style;
 
-use js::jsapi::{JSContext, JSObject, JSTracer, JSRuntime};
+use js::jsapi::{JSContext, JSObject, JSRuntime};
 use js::jsfriendapi;
 use core::nonzero::NonZero;
 use libc;