From 8bcf36b9a59b4f30fd54fceb85eeb51b1d4dee4f Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 14 Feb 2017 17:35:39 +0100 Subject: Change #[privatize] into #[derive(DenyPublicFields)] --- components/script/dom/bindings/iterable.rs | 4 +--- components/script/dom/eventtarget.rs | 3 +-- components/script/dom/range.rs | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'components/script/dom') diff --git a/components/script/dom/bindings/iterable.rs b/components/script/dom/bindings/iterable.rs index 35e83880b4f..15ff439e1eb 100644 --- a/components/script/dom/bindings/iterable.rs +++ b/components/script/dom/bindings/iterable.rs @@ -48,10 +48,8 @@ pub trait Iterable { /// An iterator over the iterable entries of a given DOM interface. //FIXME: #12811 prevents dom_struct with type parameters //#[dom_struct] +#[derive(DenyPublicFields, HeapSizeOf, JSTraceable)] #[must_root] -#[privatize] -#[derive(JSTraceable)] -#[derive(HeapSizeOf)] pub struct IterableIterator { reflector: Reflector, iterable: JS, diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 1e1a52830a6..57eedd8e333 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -220,8 +220,7 @@ impl CompiledEventListener { } } -#[derive(JSTraceable, Clone, PartialEq, HeapSizeOf)] -#[privatize] +#[derive(Clone, DenyPublicFields, HeapSizeOf, JSTraceable, PartialEq)] /// A listener in a collection of event listeners. struct EventListenerEntry { phase: ListenerPhase, diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index e9e3a484d41..65b4d1b8487 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -929,10 +929,8 @@ impl RangeMethods for Range { } } -#[derive(JSTraceable)] +#[derive(DenyPublicFields, HeapSizeOf, JSTraceable)] #[must_root] -#[privatize] -#[derive(HeapSizeOf)] pub struct BoundaryPoint { node: MutJS, offset: Cell, -- cgit v1.2.3