diff --git a/src/components/script/dom/attr.rs b/src/components/script/dom/attr.rs index 53a54f4e16c..0a2fba8893e 100644 --- a/src/components/script/dom/attr.rs +++ b/src/components/script/dom/attr.rs @@ -58,7 +58,7 @@ impl AttrValue { #[deriving(Encodable)] pub struct Attr { - pub reflector_: Reflector, + reflector_: Reflector, pub local_name: DOMString, value: Traceable>, pub name: DOMString, @@ -66,7 +66,7 @@ pub struct Attr { pub prefix: Option, /// the element that owns this attribute. - pub owner: Cell>, + owner: Cell>, } impl Reflectable for Attr { diff --git a/src/components/script/dom/attrlist.rs b/src/components/script/dom/attrlist.rs index 6a294b5746b..a2f44fca68c 100644 --- a/src/components/script/dom/attrlist.rs +++ b/src/components/script/dom/attrlist.rs @@ -11,9 +11,9 @@ use dom::window::Window; #[deriving(Encodable)] pub struct AttrList { - pub reflector_: Reflector, - pub window: JS, - pub owner: JS, + reflector_: Reflector, + window: JS, + owner: JS, } impl AttrList { diff --git a/src/components/script/dom/bindings/callback.rs b/src/components/script/dom/bindings/callback.rs index 709d7056c27..7a261bf7cc7 100644 --- a/src/components/script/dom/bindings/callback.rs +++ b/src/components/script/dom/bindings/callback.rs @@ -108,8 +108,8 @@ pub fn WrapCallThisObject(cx: *mut JSContext, } pub struct CallSetup { - pub cx: *mut JSContext, - pub handling: ExceptionHandling + cx: *mut JSContext, + handling: ExceptionHandling } impl CallSetup { diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index be94d5638cc..05741f6ed6c 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -17,9 +17,9 @@ pub enum BlobType { #[deriving(Encodable)] pub struct Blob { - pub reflector_: Reflector, - pub window: JS, - pub type_: BlobType + reflector_: Reflector, + window: JS, + type_: BlobType } impl Blob { @@ -58,4 +58,4 @@ impl FileDerived for Blob { _ => false } } -} \ No newline at end of file +} diff --git a/src/components/script/dom/clientrect.rs b/src/components/script/dom/clientrect.rs index e71190d7d52..8ab22663136 100644 --- a/src/components/script/dom/clientrect.rs +++ b/src/components/script/dom/clientrect.rs @@ -10,12 +10,12 @@ use servo_util::geometry::Au; #[deriving(Encodable)] pub struct ClientRect { - pub reflector_: Reflector, - pub top: f32, - pub bottom: f32, - pub left: f32, - pub right: f32, - pub window: JS, + reflector_: Reflector, + top: f32, + bottom: f32, + left: f32, + right: f32, + window: JS, } impl ClientRect { diff --git a/src/components/script/dom/clientrectlist.rs b/src/components/script/dom/clientrectlist.rs index 2f7d5916e27..eccca831a03 100644 --- a/src/components/script/dom/clientrectlist.rs +++ b/src/components/script/dom/clientrectlist.rs @@ -10,9 +10,9 @@ use dom::window::Window; #[deriving(Encodable)] pub struct ClientRectList { - pub reflector_: Reflector, - pub rects: Vec>, - pub window: JS, + reflector_: Reflector, + rects: Vec>, + window: JS, } impl ClientRectList { diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index e7b36d78b21..0bace6cf66a 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -61,15 +61,15 @@ pub enum IsHTMLDocument { #[deriving(Encodable)] pub struct Document { pub node: Node, - pub reflector_: Reflector, + reflector_: Reflector, pub window: JS, idmap: Traceable>>>>, - pub implementation: Cell>>, - pub content_type: DOMString, + implementation: Cell>>, + content_type: DOMString, pub encoding_name: Traceable>, pub is_html_document: bool, - pub url: Untraceable, - pub quirks_mode: Untraceable>, + url: Untraceable, + quirks_mode: Untraceable>, } impl DocumentDerived for EventTarget { diff --git a/src/components/script/dom/domimplementation.rs b/src/components/script/dom/domimplementation.rs index a0598077c82..f8460275705 100644 --- a/src/components/script/dom/domimplementation.rs +++ b/src/components/script/dom/domimplementation.rs @@ -21,8 +21,8 @@ use servo_util::str::DOMString; #[deriving(Encodable)] pub struct DOMImplementation { - pub owner: JS, - pub reflector_: Reflector, + owner: JS, + reflector_: Reflector, } impl DOMImplementation { diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 2082d4f2e39..0639da59c3a 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -48,7 +48,7 @@ pub enum EventTypeId { #[deriving(Encodable)] pub struct Event { pub type_id: EventTypeId, - pub reflector_: Reflector, + reflector_: Reflector, pub current_target: Cell>>, pub target: Cell>>, type_: Traceable>, @@ -61,7 +61,7 @@ pub struct Event { pub trusted: Traceable>, pub dispatching: Traceable>, pub initialized: Traceable>, - pub timestamp: u64, + timestamp: u64, } impl Event { diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index 676c6a33925..25a50b40ab3 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -60,7 +60,7 @@ pub struct EventListenerEntry { #[deriving(Encodable)] pub struct EventTarget { pub type_id: EventTargetTypeId, - pub reflector_: Reflector, + reflector_: Reflector, handlers: Traceable>>>, } diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index 5ad5bd5817e..1986c4f2f96 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -25,10 +25,10 @@ pub enum FormDatum { #[deriving(Encodable)] pub struct FormData { - pub data: Traceable>>>, - pub reflector_: Reflector, - pub window: JS, - pub form: Option> + data: Traceable>>>, + reflector_: Reflector, + window: JS, + form: Option> } impl FormData { diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index 64bf42ecfe5..57f8334b757 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -32,9 +32,9 @@ pub enum CollectionTypeId { #[deriving(Encodable)] pub struct HTMLCollection { - pub collection: CollectionTypeId, - pub reflector_: Reflector, - pub window: JS, + collection: CollectionTypeId, + reflector_: Reflector, + window: JS, } impl HTMLCollection { diff --git a/src/components/script/dom/location.rs b/src/components/script/dom/location.rs index 7afb87bf970..55f540809db 100644 --- a/src/components/script/dom/location.rs +++ b/src/components/script/dom/location.rs @@ -16,8 +16,8 @@ use serialize::{Encoder, Encodable}; #[deriving(Encodable)] pub struct Location { - pub reflector_: Reflector, //XXXjdm cycle: window->Location->window - pub page: Rc, + reflector_: Reflector, //XXXjdm cycle: window->Location->window + page: Rc, } impl Location { diff --git a/src/components/script/dom/nodelist.rs b/src/components/script/dom/nodelist.rs index 62e4d12e3b3..fd83bf458e6 100644 --- a/src/components/script/dom/nodelist.rs +++ b/src/components/script/dom/nodelist.rs @@ -16,9 +16,9 @@ pub enum NodeListType { #[deriving(Encodable)] pub struct NodeList { - pub list_type: NodeListType, - pub reflector_: Reflector, - pub window: JS + list_type: NodeListType, + reflector_: Reflector, + window: JS } impl NodeList { diff --git a/src/components/script/dom/performance.rs b/src/components/script/dom/performance.rs index 0610a52538d..fcbd23a2bf2 100644 --- a/src/components/script/dom/performance.rs +++ b/src/components/script/dom/performance.rs @@ -13,8 +13,8 @@ pub type DOMHighResTimeStamp = f64; #[deriving(Encodable)] pub struct Performance { - pub reflector_: Reflector, - pub timing: JS, + reflector_: Reflector, + timing: JS, } impl Performance { diff --git a/src/components/script/dom/performancetiming.rs b/src/components/script/dom/performancetiming.rs index a63fe54e68b..328b351844f 100644 --- a/src/components/script/dom/performancetiming.rs +++ b/src/components/script/dom/performancetiming.rs @@ -9,9 +9,9 @@ use dom::window::Window; #[deriving(Encodable)] pub struct PerformanceTiming { - pub reflector_: Reflector, - pub navigationStart: u64, - pub navigationStartPrecise: f64, + reflector_: Reflector, + navigationStart: u64, + navigationStartPrecise: f64, } impl PerformanceTiming { diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index 38084d62c37..79e88b4f76b 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -18,8 +18,8 @@ use std::cell::Cell; #[deriving(Encodable)] pub struct UIEvent { pub event: Event, - pub view: Cell>>, - pub detail: Traceable> + view: Cell>>, + detail: Traceable> } impl UIEventDerived for Event { diff --git a/src/components/script/dom/validitystate.rs b/src/components/script/dom/validitystate.rs index e08ffbf6a9f..5731399830f 100644 --- a/src/components/script/dom/validitystate.rs +++ b/src/components/script/dom/validitystate.rs @@ -10,9 +10,9 @@ use std::cell::Cell; #[deriving(Encodable)] pub struct ValidityState { - pub reflector_: Reflector, - pub window: Cell>, - pub state: u8, + reflector_: Reflector, + window: Cell>, + state: u8, } impl ValidityState { diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 7d50a8dac4a..f9dd1b979b1 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -48,9 +48,9 @@ pub struct TimerId(i32); #[deriving(Encodable)] pub struct TimerHandle { - pub handle: TimerId, + handle: TimerId, pub data: TimerData, - pub cancel_chan: Untraceable>>, + cancel_chan: Untraceable>>, } impl Hash for TimerId { @@ -68,18 +68,18 @@ impl TimerHandle { #[deriving(Encodable)] pub struct Window { - pub eventtarget: EventTarget, + eventtarget: EventTarget, pub script_chan: ScriptChan, - pub console: Cell>>, - pub location: Cell>>, - pub navigator: Cell>>, + console: Cell>>, + location: Cell>>, + navigator: Cell>>, pub image_cache_task: ImageCacheTask, pub active_timers: Traceable>>, - pub next_timer_handle: Traceable>, - pub compositor: Untraceable>, + next_timer_handle: Traceable>, + compositor: Untraceable>, pub browser_context: Traceable>>, pub page: Rc, - pub performance: Cell>>, + performance: Cell>>, pub navigationStart: u64, pub navigationStartPrecise: f64, }