Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
bors-servo 2015-03-26 10:39:57 -06:00
commit 265f313de3
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/macros.rs
View file

@ -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
}
}

2
components/script/dom/node.rs
View file

@ -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;