Make #[dom_struct] a proc_macro attribute

Cargo.lock

@@ -629,6 +629,13 @@ dependencies = [
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "dom_struct"
+version = "0.0.1"
+dependencies = [
+ "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "domobject_derive"
 version = "0.0.1"
@@ -2204,6 +2211,7 @@ dependencies = [
  "cssparser 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "deny_public_fields 0.0.1",
  "devtools_traits 0.0.1",
+ "dom_struct 0.0.1",
  "domobject_derive 0.0.1",
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",

components/dom_struct/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "dom_struct"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+publish = false
+
+[lib]
+path = "lib.rs"
+proc-macro = true
+
+[dependencies]
+quote = "0.3"

components/dom_struct/lib.rs

@@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#![feature(proc_macro)]
+
+extern crate proc_macro;
+#[macro_use] extern crate quote;
+
+use proc_macro::TokenStream;
+
+#[proc_macro_attribute]
+pub fn dom_struct(args: TokenStream, input: TokenStream) -> TokenStream {
+    if !args.to_string().is_empty() {
+        panic!("#[dom_struct] takes no arguments");
+    }
+    expand_string(&input.to_string()).parse().unwrap()
+}
+
+fn expand_string(input: &str) -> String {
+    let mut tokens = quote! {
+        #[derive(DenyPublicFields, DomObject, HeapSizeOf, JSTraceable)]
+        #[must_root]
+        #[repr(C)]
+    };
+    tokens.append(input);
+    tokens.to_string()
+}

components/script/Cargo.toml

@@ -37,6 +37,7 @@ cookie = {version = "0.2.5", features = ["serialize-rustc"]}
 cssparser = {version = "0.10", features = ["heapsize", "serde"]}
 deny_public_fields = {path = "../deny_public_fields"}
 devtools_traits = {path = "../devtools_traits"}
+dom_struct = {path = "../dom_struct"}
 domobject_derive = {path = "../domobject_derive"}
 encoding = "0.2"
 euclid = "0.11"

components/script/docs/JS-Servos-only-GC.md

@@ -138,6 +138,8 @@ Let's look at [Servo's implementation][document-rs] of the DOM's
 [document-mdn]: https://developer.mozilla.org/en-US/docs/Web/API/document
 
 ```rust
+use dom_struct::dom_struct;
+
 #[dom_struct]
 pub struct Document {
     node: Node,

components/script/dom/attr.rs

@@ -12,6 +12,7 @@ use dom::bindings::str::DOMString;
 use dom::element::{AttributeMutation, Element};
 use dom::virtualmethods::vtable_for;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use html5ever_atoms::{Prefix, LocalName, Namespace};
 use servo_atoms::Atom;
 use std::borrow::ToOwned;

components/script/dom/beforeunloadevent.rs

@@ -14,6 +14,7 @@ use dom::bindings::reflector::reflect_dom_object;
 use dom::bindings::str::DOMString;
 use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::window::Window;
+use dom_struct::dom_struct;
 use servo_atoms::Atom;
 
 // https://html.spec.whatwg.org/multipage/#beforeunloadevent

components/script/dom/bindings/iterable.rs

@@ -14,6 +14,7 @@ use dom::bindings::js::{JS, Root};
 use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
 use dom::bindings::trace::JSTraceable;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use js::conversions::ToJSValConvertible;
 use js::jsapi::{HandleValue, Heap, JSContext, JSObject, MutableHandleObject};
 use js::jsval::UndefinedValue;

components/script/dom/blob.rs

@@ -11,6 +11,7 @@ use dom::bindings::js::{JS, Root};
 use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
 use dom::bindings::str::DOMString;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use encoding::all::UTF_8;
 use encoding::types::{EncoderTrap, Encoding};
 use ipc_channel::ipc;

components/script/dom/bluetooth.rs

@@ -30,6 +30,7 @@ use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
 use dom::permissions::{get_descriptor_permission_state, PermissionAlgorithm};
 use dom::promise::Promise;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use js::conversions::ConversionResult;

components/script/dom/bluetoothadvertisingevent.rs

@@ -14,6 +14,7 @@ use dom::bluetoothdevice::BluetoothDevice;
 use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::globalscope::GlobalScope;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use servo_atoms::Atom;
 
 // https://webbluetoothcg.github.io/web-bluetooth/#bluetoothadvertisingevent

components/script/dom/bluetoothcharacteristicproperties.rs

@@ -8,6 +8,7 @@ use dom::bindings::codegen::Bindings::BluetoothCharacteristicPropertiesBinding::
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 
 // https://webbluetoothcg.github.io/web-bluetooth/#characteristicproperties
  #[dom_struct]

components/script/dom/bluetoothdevice.rs

@@ -24,6 +24,7 @@ use dom::bluetoothremotegattservice::BluetoothRemoteGATTService;
 use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
 use dom::promise::Promise;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::{self, IpcSender};
 use js::jsapi::JSContext;
 use std::cell::Cell;

components/script/dom/bluetoothpermissionresult.rs

@@ -18,6 +18,7 @@ use dom::bluetoothdevice::BluetoothDevice;
 use dom::globalscope::GlobalScope;
 use dom::permissionstatus::PermissionStatus;
 use dom::promise::Promise;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
 use js::jsapi::JSContext;
 use std::rc::Rc;

components/script/dom/bluetoothremotegattcharacteristic.rs

@@ -25,6 +25,7 @@ use dom::bluetoothuuid::{BluetoothDescriptorUUID, BluetoothUUID};
 use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
 use dom::promise::Promise;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
 use js::jsapi::JSContext;
 use std::rc::Rc;

components/script/dom/bluetoothremotegattdescriptor.rs

@@ -19,6 +19,7 @@ use dom::bluetooth::{AsyncBluetoothListener, response_async};
 use dom::bluetoothremotegattcharacteristic::{BluetoothRemoteGATTCharacteristic, MAXIMUM_ATTRIBUTE_LENGTH};
 use dom::globalscope::GlobalScope;
 use dom::promise::Promise;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
 use js::jsapi::JSContext;
 use std::rc::Rc;

components/script/dom/bluetoothremotegattserver.rs

@@ -15,6 +15,7 @@ use dom::bluetoothdevice::BluetoothDevice;
 use dom::bluetoothuuid::{BluetoothServiceUUID, BluetoothUUID};
 use dom::globalscope::GlobalScope;
 use dom::promise::Promise;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
 use js::jsapi::JSContext;
 use std::cell::Cell;

components/script/dom/bluetoothremotegattservice.rs

@@ -17,6 +17,7 @@ use dom::bluetoothuuid::{BluetoothCharacteristicUUID, BluetoothServiceUUID, Blue
 use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
 use dom::promise::Promise;
+use dom_struct::dom_struct;
 use js::jsapi::JSContext;
 use std::rc::Rc;
 

components/script/dom/bluetoothuuid.rs

@@ -8,6 +8,7 @@ use dom::bindings::error::Fallible;
 use dom::bindings::reflector::Reflector;
 use dom::bindings::str::DOMString;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use regex::Regex;
 
 pub type UUID = DOMString;

components/script/dom/browsingcontext.rs

@@ -15,6 +15,7 @@ use dom::dissimilaroriginwindow::DissimilarOriginWindow;
 use dom::element::Element;
 use dom::globalscope::GlobalScope;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use js::JSCLASS_IS_GLOBAL;
 use js::glue::{CreateWrapperProxyHandler, ProxyTraps, NewWindowProxy};
 use js::glue::{GetProxyPrivate, SetProxyExtra, GetProxyExtra};

components/script/dom/canvasgradient.rs

@@ -14,6 +14,7 @@ use dom::bindings::num::Finite;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::str::DOMString;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 
 // https://html.spec.whatwg.org/multipage/#canvasgradient
 #[dom_struct]

components/script/dom/canvaspattern.rs

@@ -8,6 +8,7 @@ use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::canvasgradient::ToFillOrStrokeStyle;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use euclid::size::Size2D;
 
 // https://html.spec.whatwg.org/multipage/#canvaspattern

components/script/dom/canvasrenderingcontext2d.rs

@@ -33,6 +33,7 @@ use dom::htmlcanvaselement::utils as canvas_utils;
 use dom::htmlimageelement::HTMLImageElement;
 use dom::imagedata::ImageData;
 use dom::node::{Node, NodeDamage, window_from_node};
+use dom_struct::dom_struct;
 use euclid::matrix2d::Matrix2D;
 use euclid::point::Point2D;
 use euclid::rect::Rect;

components/script/dom/characterdata.rs

@@ -19,6 +19,7 @@ use dom::element::Element;
 use dom::node::{Node, NodeDamage};
 use dom::processinginstruction::ProcessingInstruction;
 use dom::text::Text;
+use dom_struct::dom_struct;
 use servo_config::opts;
 use std::cell::Ref;
 

components/script/dom/client.rs

@@ -9,6 +9,7 @@ use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::str::{DOMString, USVString};
 use dom::serviceworker::ServiceWorker;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use servo_url::ServoUrl;
 use std::default::Default;
 use uuid::Uuid;

components/script/dom/closeevent.rs

@@ -12,6 +12,7 @@ use dom::bindings::reflector::reflect_dom_object;
 use dom::bindings::str::DOMString;
 use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use servo_atoms::Atom;
 
 #[dom_struct]

components/script/dom/comment.rs

@@ -11,6 +11,7 @@ use dom::characterdata::CharacterData;
 use dom::document::Document;
 use dom::node::Node;
 use dom::window::Window;
+use dom_struct::dom_struct;
 
 /// An HTML comment.
 #[dom_struct]

components/script/dom/crypto.rs

@@ -10,6 +10,7 @@ use dom::bindings::error::{Error, Fallible};
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use js::jsapi::{JSContext, JSObject};
 use js::jsapi::Type;
 use servo_rand::{ServoRng, Rng};

components/script/dom/css.rs

@@ -8,6 +8,7 @@ use dom::bindings::error::Fallible;
 use dom::bindings::reflector::Reflector;
 use dom::bindings::str::DOMString;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use style::parser::ParserContext;
 use style::supports::{Declaration, parse_condition_or_declaration};
 

components/script/dom/cssconditionrule.rs

@@ -9,6 +9,7 @@ use dom::cssgroupingrule::CSSGroupingRule;
 use dom::cssmediarule::CSSMediaRule;
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::csssupportsrule::CSSSupportsRule;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::stylesheets::CssRules as StyleCssRules;

components/script/dom/cssfontfacerule.rs

@@ -9,6 +9,7 @@ use dom::bindings::str::DOMString;
 use dom::cssrule::{CSSRule, SpecificCSSRule};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::font_face::FontFaceRule;

components/script/dom/cssgroupingrule.rs

@@ -11,6 +11,7 @@ use dom::bindings::str::DOMString;
 use dom::cssrule::CSSRule;
 use dom::cssrulelist::{CSSRuleList, RulesSource};
 use dom::cssstylesheet::CSSStyleSheet;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::stylesheets::CssRules as StyleCssRules;

components/script/dom/cssimportrule.rs

@@ -9,6 +9,7 @@ use dom::bindings::str::DOMString;
 use dom::cssrule::{CSSRule, SpecificCSSRule};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::stylesheets::ImportRule;

components/script/dom/csskeyframerule.rs

@@ -11,6 +11,7 @@ use dom::cssrule::{CSSRule, SpecificCSSRule};
 use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::keyframes::Keyframe;

components/script/dom/csskeyframesrule.rs

@@ -15,6 +15,7 @@ use dom::cssrule::{CSSRule, SpecificCSSRule};
 use dom::cssrulelist::{CSSRuleList, RulesSource};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use servo_atoms::Atom;
 use std::sync::Arc;

components/script/dom/cssmediarule.rs

@@ -13,6 +13,7 @@ use dom::cssrule::SpecificCSSRule;
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::medialist::MediaList;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::media_queries::parse_media_query_list;

components/script/dom/cssnamespacerule.rs

@@ -10,6 +10,7 @@ use dom::bindings::str::DOMString;
 use dom::cssrule::{CSSRule, SpecificCSSRule};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::stylesheets::NamespaceRule;

components/script/dom/cssrule.rs

@@ -18,6 +18,7 @@ use dom::cssstylesheet::CSSStyleSheet;
 use dom::csssupportsrule::CSSSupportsRule;
 use dom::cssviewportrule::CSSViewportRule;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use std::cell::Cell;
 use style::stylesheets::CssRule as StyleCssRule;
 

components/script/dom/cssrulelist.rs

@@ -12,6 +12,7 @@ use dom::csskeyframerule::CSSKeyframeRule;
 use dom::cssrule::CSSRule;
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::stylesheets::{CssRules, KeyframesRule, RulesMutateError};

components/script/dom/cssstyledeclaration.rs

@@ -13,6 +13,7 @@ use dom::cssrule::CSSRule;
 use dom::element::Element;
 use dom::node::{Node, window_from_node};
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use servo_url::ServoUrl;
 use std::ascii::AsciiExt;

components/script/dom/cssstylerule.rs

@@ -11,6 +11,7 @@ use dom::cssrule::{CSSRule, SpecificCSSRule};
 use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::stylesheets::StyleRule;

components/script/dom/cssstylesheet.rs

@@ -13,6 +13,7 @@ use dom::cssrulelist::{CSSRuleList, RulesSource};
 use dom::element::Element;
 use dom::stylesheet::StyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use std::cell::Cell;
 use std::sync::Arc;
 use style::stylesheets::Stylesheet as StyleStyleSheet;

components/script/dom/csssupportsrule.rs

@@ -12,6 +12,7 @@ use dom::cssconditionrule::CSSConditionRule;
 use dom::cssrule::SpecificCSSRule;
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::parser::ParserContext;

components/script/dom/cssviewportrule.rs

@@ -9,6 +9,7 @@ use dom::bindings::str::DOMString;
 use dom::cssrule::{CSSRule, SpecificCSSRule};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use parking_lot::RwLock;
 use std::sync::Arc;
 use style::viewport::ViewportRule;

components/script/dom/customevent.rs

@@ -13,6 +13,7 @@ use dom::bindings::str::DOMString;
 use dom::bindings::trace::RootedTraceableBox;
 use dom::event::Event;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use js::jsapi::{HandleValue, JSContext};
 use js::jsval::JSVal;
 use servo_atoms::Atom;

components/script/dom/dedicatedworkerglobalscope.rs

@@ -20,6 +20,7 @@ use dom::globalscope::GlobalScope;
 use dom::messageevent::MessageEvent;
 use dom::worker::{TrustedWorkerAddress, WorkerErrorHandler, WorkerMessageHandler};
 use dom::workerglobalscope::WorkerGlobalScope;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use js::jsapi::{HandleValue, JS_SetInterruptCallback};

components/script/dom/dissimilaroriginlocation.rs

@@ -11,6 +11,7 @@ use dom::bindings::reflector::reflect_dom_object;
 use dom::bindings::str::DOMString;
 use dom::bindings::str::USVString;
 use dom::dissimilaroriginwindow::DissimilarOriginWindow;
+use dom_struct::dom_struct;
 
 /// Represents a dissimilar-origin `Location` that exists in another script thread.
 ///

components/script/dom/dissimilaroriginwindow.rs

@@ -10,6 +10,7 @@ use dom::bindings::str::DOMString;
 use dom::browsingcontext::BrowsingContext;
 use dom::dissimilaroriginlocation::DissimilarOriginLocation;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use ipc_channel::ipc;
 use js::jsapi::{JSContext, HandleValue};
 use js::jsval::{JSVal, UndefinedValue};

components/script/dom/document.rs

@@ -87,6 +87,7 @@ use dom::treewalker::TreeWalker;
 use dom::uievent::UIEvent;
 use dom::webglcontextevent::WebGLContextEvent;
 use dom::window::{ReflowReason, Window};
+use dom_struct::dom_struct;
 use encoding::EncodingRef;
 use encoding::all::UTF_8;
 use euclid::point::Point2D;

components/script/dom/documentfragment.rs

@@ -16,6 +16,7 @@ use dom::htmlcollection::HTMLCollection;
 use dom::node::{Node, window_from_node};
 use dom::nodelist::NodeList;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use servo_atoms::Atom;
 
 // https://dom.spec.whatwg.org/#documentfragment

components/script/dom/documenttype.rs

@@ -11,6 +11,7 @@ use dom::bindings::js::Root;
 use dom::bindings::str::DOMString;
 use dom::document::Document;
 use dom::node::Node;
+use dom_struct::dom_struct;
 
 // https://dom.spec.whatwg.org/#documenttype
 /// The `DOCTYPE` tag.

components/script/dom/domexception.rs

@@ -9,6 +9,7 @@ use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::str::DOMString;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 
 #[repr(u16)]
 #[derive(JSTraceable, Copy, Clone, Debug, HeapSizeOf)]

components/script/dom/domimplementation.rs

@@ -23,6 +23,7 @@ use dom::htmltitleelement::HTMLTitleElement;
 use dom::node::Node;
 use dom::text::Text;
 use dom::xmldocument::XMLDocument;
+use dom_struct::dom_struct;
 use script_traits::DocumentActivity;
 
 // https://dom.spec.whatwg.org/#domimplementation

components/script/dom/dommatrix.rs

@@ -10,6 +10,7 @@ use dom::bindings::js::Root;
 use dom::bindings::reflector::reflect_dom_object;
 use dom::dommatrixreadonly::{dommatrixinit_to_matrix, DOMMatrixReadOnly, entries_to_matrix};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use euclid::Matrix4D;
 
 

components/script/dom/dommatrixreadonly.rs

@@ -13,6 +13,7 @@ use dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
 use dom::dommatrix::DOMMatrix;
 use dom::dompoint::DOMPoint;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use euclid::{Matrix4D, Point4D, Radians};
 use std::cell::{Cell, Ref};
 use std::f64;

components/script/dom/domparser.rs

@@ -19,6 +19,7 @@ use dom::document::{Document, HasBrowsingContext, IsHTMLDocument};
 use dom::document::DocumentSource;
 use dom::servoparser::ServoParser;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use script_traits::DocumentActivity;
 
 #[dom_struct]

components/script/dom/dompoint.rs

@@ -9,6 +9,7 @@ use dom::bindings::js::Root;
 use dom::bindings::reflector::reflect_dom_object;
 use dom::dompointreadonly::{DOMPointReadOnly, DOMPointWriteMethods};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 
 // http://dev.w3.org/fxtf/geometry/Overview.html#dompoint
 #[dom_struct]

components/script/dom/dompointreadonly.rs

@@ -7,6 +7,7 @@ use dom::bindings::error::Fallible;
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use std::cell::Cell;
 
 // http://dev.w3.org/fxtf/geometry/Overview.html#dompointreadonly

components/script/dom/domquad.rs

@@ -11,6 +11,7 @@ use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
 use dom::dompoint::DOMPoint;
 use dom::domrect::DOMRect;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 
 // https://drafts.fxtf.org/geometry/#DOMQuad
 #[dom_struct]

components/script/dom/domrect.rs

@@ -10,6 +10,7 @@ use dom::bindings::js::Root;
 use dom::bindings::reflector::reflect_dom_object;
 use dom::domrectreadonly::DOMRectReadOnly;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 
 #[dom_struct]
 pub struct DOMRect {

components/script/dom/domrectlist.rs

@@ -8,6 +8,7 @@ use dom::bindings::js::{JS, Root};
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::domrect::DOMRect;
 use dom::window::Window;
+use dom_struct::dom_struct;
 
 #[dom_struct]
 pub struct DOMRectList {

components/script/dom/domrectreadonly.rs

@@ -7,6 +7,7 @@ use dom::bindings::error::Fallible;
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use std::cell::Cell;
 
 #[dom_struct]

components/script/dom/domstringmap.rs

@@ -10,6 +10,7 @@ use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::str::DOMString;
 use dom::htmlelement::HTMLElement;
 use dom::node::window_from_node;
+use dom_struct::dom_struct;
 
 #[dom_struct]
 pub struct DOMStringMap {

components/script/dom/domtokenlist.rs

@@ -11,6 +11,7 @@ use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::str::DOMString;
 use dom::element::Element;
 use dom::node::window_from_node;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use servo_atoms::Atom;
 use style::str::HTML_SPACE_CHARACTERS;

components/script/dom/element.rs

@@ -72,6 +72,7 @@ use dom::text::Text;
 use dom::validation::Validatable;
 use dom::virtualmethods::{VirtualMethods, vtable_for};
 use dom::window::ReflowReason;
+use dom_struct::dom_struct;
 use html5ever::serialize;
 use html5ever::serialize::SerializeOpts;
 use html5ever::serialize::TraversalScope;

components/script/dom/errorevent.rs

@@ -14,6 +14,7 @@ use dom::bindings::str::DOMString;
 use dom::bindings::trace::RootedTraceableBox;
 use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use js::jsapi::{HandleValue, JSContext};
 use js::jsval::JSVal;
 use servo_atoms::Atom;

components/script/dom/event.rs

@@ -19,6 +19,7 @@ use dom::globalscope::GlobalScope;
 use dom::node::Node;
 use dom::virtualmethods::vtable_for;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use script_thread::Runnable;
 use servo_atoms::Atom;
 use std::cell::Cell;

components/script/dom/eventsource.rs

@@ -15,6 +15,7 @@ use dom::event::Event;
 use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
 use dom::messageevent::MessageEvent;
+use dom_struct::dom_struct;
 use encoding::Encoding;
 use encoding::all::UTF_8;
 use euclid::length::Length;

components/script/dom/eventtarget.rs

@@ -26,6 +26,7 @@ use dom::event::{Event, EventBubbles, EventCancelable, EventStatus};
 use dom::node::document_from_node;
 use dom::virtualmethods::VirtualMethods;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use fnv::FnvHasher;
 use heapsize::HeapSizeOf;
 use js::jsapi::{CompileFunction, JS_GetFunctionObject, JSAutoCompartment};

components/script/dom/extendableevent.rs

@@ -11,6 +11,7 @@ use dom::bindings::reflector::reflect_dom_object;
 use dom::bindings::str::DOMString;
 use dom::event::Event;
 use dom::serviceworkerglobalscope::ServiceWorkerGlobalScope;
+use dom_struct::dom_struct;
 use js::jsapi::{HandleValue, JSContext};
 use servo_atoms::Atom;
 

components/script/dom/extendablemessageevent.rs

@@ -15,6 +15,7 @@ use dom::eventtarget::EventTarget;
 use dom::extendableevent::ExtendableEvent;
 use dom::globalscope::GlobalScope;
 use dom::serviceworkerglobalscope::ServiceWorkerGlobalScope;
+use dom_struct::dom_struct;
 use js::jsapi::{HandleValue, Heap, JSContext};
 use js::jsval::JSVal;
 use servo_atoms::Atom;

components/script/dom/file.rs

@@ -13,6 +13,7 @@ use dom::bindings::str::DOMString;
 use dom::blob::{Blob, BlobImpl, blob_parts_to_bytes};
 use dom::globalscope::GlobalScope;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use net_traits::filemanager_thread::SelectedFile;
 use time;
 

components/script/dom/filelist.rs

@@ -8,6 +8,7 @@ use dom::bindings::js::{JS, Root};
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::file::File;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use std::slice::Iter;
 
 // https://w3c.github.io/FileAPI/#dfn-filelist

components/script/dom/filereader.rs

@@ -19,6 +19,7 @@ use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
 use dom::progressevent::ProgressEvent;
+use dom_struct::dom_struct;
 use encoding::all::UTF_8;
 use encoding::label::encoding_from_whatwg_label;
 use encoding::types::{DecoderTrap, EncodingRef};

components/script/dom/filereadersync.rs

@@ -8,6 +8,7 @@ use dom::bindings::js::Root;
 use dom::bindings::reflector::reflect_dom_object;
 use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 
 #[dom_struct]
 pub struct FileReaderSync {

components/script/dom/focusevent.rs

@@ -14,6 +14,7 @@ use dom::event::{EventBubbles, EventCancelable};
 use dom::eventtarget::EventTarget;
 use dom::uievent::UIEvent;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use std::default::Default;
 
 #[dom_struct]

components/script/dom/forcetouchevent.rs

@@ -12,6 +12,7 @@ use dom::bindings::reflector::reflect_dom_object;
 use dom::bindings::str::DOMString;
 use dom::uievent::UIEvent;
 use dom::window::Window;
+use dom_struct::dom_struct;
 
 #[dom_struct]
 pub struct ForceTouchEvent {

components/script/dom/formdata.rs

@@ -15,6 +15,7 @@ use dom::blob::{Blob, BlobImpl};
 use dom::file::File;
 use dom::globalscope::GlobalScope;
 use dom::htmlformelement::{HTMLFormElement, FormDatumValue, FormDatum};
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};

components/script/dom/globalscope.rs

@@ -19,6 +19,7 @@ use dom::event::{Event, EventBubbles, EventCancelable, EventStatus};
 use dom::eventtarget::EventTarget;
 use dom::window::Window;
 use dom::workerglobalscope::WorkerGlobalScope;
+use dom_struct::dom_struct;
 use ipc_channel::ipc::IpcSender;
 use js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL};
 use js::glue::{IsWrapper, UnwrapObject};

components/script/dom/hashchangeevent.rs

@@ -12,6 +12,7 @@ use dom::bindings::reflector::reflect_dom_object;
 use dom::bindings::str::{DOMString, USVString};
 use dom::event::Event;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use servo_atoms::Atom;
 
 // https://html.spec.whatwg.org/multipage/#hashchangeevent

components/script/dom/headers.rs

@@ -10,6 +10,7 @@ use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::str::{ByteString, is_token};
 use dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
 use hyper::header::Headers as HyperHeaders;
 use mime::{Mime, TopLevel, SubLevel};
 use std::cell::Cell;

components/script/dom/history.rs

@@ -11,6 +11,7 @@ use dom::bindings::js::{JS, Root};
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::globalscope::GlobalScope;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use ipc_channel::ipc;
 use msg::constellation_msg::TraversalDirection;
 use script_traits::ScriptMsg as ConstellationMsg;

components/script/dom/htmlanchorelement.rs

@@ -24,6 +24,7 @@ use dom::mouseevent::MouseEvent;
 use dom::node::{Node, document_from_node};
 use dom::urlhelper::UrlHelper;
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use net_traits::ReferrerPolicy;
 use num_traits::ToPrimitive;

components/script/dom/htmlappletelement.rs

@@ -11,6 +11,7 @@ use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use style::attr::AttrValue;
 

components/script/dom/htmlareaelement.rs

@@ -18,6 +18,7 @@ use dom::htmlanchorelement::follow_hyperlink;
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, document_from_node};
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use euclid::point::Point2D;
 use html5ever_atoms::LocalName;
 use net_traits::ReferrerPolicy;

components/script/dom/htmlaudioelement.rs

@@ -8,6 +8,7 @@ use dom::bindings::str::DOMString;
 use dom::document::Document;
 use dom::htmlmediaelement::HTMLMediaElement;
 use dom::node::Node;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmlbaseelement.rs

@@ -13,6 +13,7 @@ use dom::element::{AttributeMutation, Element};
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, UnbindContext, document_from_node};
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use servo_url::ServoUrl;
 use style::attr::AttrValue;

components/script/dom/htmlbodyelement.rs

@@ -17,6 +17,7 @@ use dom::globalscope::GlobalScope;
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, document_from_node, window_from_node};
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use script_traits::ScriptMsg as ConstellationMsg;
 use servo_url::ServoUrl;

components/script/dom/htmlbrelement.rs

@@ -8,6 +8,7 @@ use dom::bindings::str::DOMString;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmlbuttonelement.rs

@@ -23,6 +23,7 @@ use dom::nodelist::NodeList;
 use dom::validation::Validatable;
 use dom::validitystate::{ValidityState, ValidationFlags};
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use std::cell::Cell;
 use style::element_state::*;

components/script/dom/htmlcanvaselement.rs

@@ -24,6 +24,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use dom::webglrenderingcontext::{LayoutCanvasWebGLRenderingContextHelpers, WebGLRenderingContext};
+use dom_struct::dom_struct;
 use euclid::size::Size2D;
 use html5ever_atoms::LocalName;
 use image::ColorType;

components/script/dom/htmlcollection.rs

@@ -13,6 +13,7 @@ use dom::bindings::xmlname::namespace_from_domstring;
 use dom::element::Element;
 use dom::node::Node;
 use dom::window::Window;
+use dom_struct::dom_struct;
 use html5ever_atoms::{LocalName, QualName};
 use servo_atoms::Atom;
 use std::cell::Cell;

components/script/dom/htmldataelement.rs

@@ -9,6 +9,7 @@ use dom::bindings::str::DOMString;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmldatalistelement.rs

@@ -13,6 +13,7 @@ use dom::htmlcollection::{CollectionFilter, HTMLCollection};
 use dom::htmlelement::HTMLElement;
 use dom::htmloptionelement::HTMLOptionElement;
 use dom::node::{Node, window_from_node};
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmldetailselement.rs

@@ -15,6 +15,7 @@ use dom::eventtarget::EventTarget;
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, window_from_node};
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use script_thread::Runnable;
 use std::cell::Cell;

components/script/dom/htmldialogelement.rs

@@ -13,6 +13,7 @@ use dom::element::Element;
 use dom::eventtarget::EventTarget;
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, window_from_node};
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmldirectoryelement.rs

@@ -8,6 +8,7 @@ use dom::bindings::str::DOMString;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmldivelement.rs

@@ -8,6 +8,7 @@ use dom::bindings::str::DOMString;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmldlistelement.rs

@@ -8,6 +8,7 @@ use dom::bindings::str::DOMString;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 
 #[dom_struct]

components/script/dom/htmlelement.rs

@@ -29,6 +29,7 @@ use dom::node::{Node, SEQUENTIALLY_FOCUSABLE};
 use dom::node::{document_from_node, window_from_node};
 use dom::nodelist::NodeList;
 use dom::virtualmethods::VirtualMethods;
+use dom_struct::dom_struct;
 use html5ever_atoms::LocalName;
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;