Remove dependency on rustc_plugin from servo

Author: Mark-Simulacrum

collector/benchmarks/script-servo/components/dom_struct/lib.rs

@@ -16,7 +16,6 @@ pub fn dom_struct(args: TokenStream, input: TokenStream) -> TokenStream {
     }
     let attributes = quote! {
         #[derive(DenyPublicFields, DomObject, JSTraceable, MallocSizeOf)]
-        #[must_root]
         #[repr(C)]
     };
     let attributes = attributes.to_string().parse().unwrap();

collector/benchmarks/script-servo/components/script/Cargo.toml

@@ -14,8 +14,7 @@ path = "lib.rs"
 [features]
 debugmozjs = ['js/debugmozjs']
 unstable = ["servo_allocator/unstable"]
-unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"]
-default = ["unrooted_must_root_lint"]
+default = []
 
 [build-dependencies]
 cmake = "0.1"
@@ -75,7 +74,6 @@ ref_filter_map = "1.0.1"
 ref_slice = "1.0"
 regex = "0.2"
 script_layout_interface = {path = "../script_layout_interface"}
-script_plugins = {path = "../script_plugins"}
 script_traits = {path = "../script_traits"}
 selectors = { path = "../selectors" }
 serde = "1.0"

collector/benchmarks/script-servo/components/script/document_loader.rs

@@ -42,7 +42,6 @@ impl LoadType {
 /// created via DocumentLoader::fetch_async) are always removed by the time
 /// that the owner is destroyed.
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct LoadBlocker {
     /// The document whose load event is blocked by this object existing.
     doc: Dom<Document>,

collector/benchmarks/script-servo/components/script/dom/bindings/callback.rs

@@ -36,7 +36,6 @@ pub enum ExceptionHandling {
 /// A common base class for representing IDL callback function and
 /// callback interface types.
 #[derive(JSTraceable)]
-#[must_root]
 pub struct CallbackObject {
     /// The underlying `JSObject`.
     callback: Heap<*mut JSObject>,
@@ -127,7 +126,6 @@ pub trait CallbackContainer {
 
 /// A common base class for representing IDL callback function types.
 #[derive(JSTraceable, PartialEq)]
-#[must_root]
 pub struct CallbackFunction {
     object: CallbackObject,
 }
@@ -158,7 +156,6 @@ impl CallbackFunction {
 
 /// A common base class for representing IDL callback interface types.
 #[derive(JSTraceable, PartialEq)]
-#[must_root]
 pub struct CallbackInterface {
     object: CallbackObject,
 }

collector/benchmarks/script-servo/components/script/dom/bindings/codegen/CodegenRust.py

@@ -6070,7 +6070,7 @@ def struct(self):
         derive = ["JSTraceable"]
         mustRoot = ""
         if self.membersNeedTracing():
-            mustRoot = "#[must_root]\n"
+            mustRoot = ""
             derive += ["Default"]
 
         return (string.Template(
@@ -6522,7 +6522,7 @@ def __init__(self, idlObject, descriptorProvider, baseName, methods,
                          bases=[ClassBase(baseName)],
                          constructors=self.getConstructors(),
                          methods=realMethods + getters + setters,
-                         decorators="#[derive(JSTraceable, PartialEq)]\n#[allow_unrooted_interior]")
+                         decorators="#[derive(JSTraceable, PartialEq)]")
 
     def getConstructors(self):
         return [ClassConstructor(

collector/benchmarks/script-servo/components/script/dom/bindings/refcounted.rs

@@ -145,7 +145,6 @@ impl TrustedPromise {
 /// shared among threads for use in asynchronous operations. The underlying
 /// DOM object is guaranteed to live at least as long as the last outstanding
 /// `Trusted<T>` instance.
-#[allow_unrooted_interior]
 pub struct Trusted<T: DomObject> {
     /// A pointer to the Rust DOM object of type T, but void to allow
     /// sending `Trusted<T>` between threads, regardless of T's sendability.

collector/benchmarks/script-servo/components/script/dom/bindings/reflector.rs

@@ -28,7 +28,6 @@ pub fn reflect_dom_object<T, U>(
 /// A struct to store a reference to the reflector of a DOM object.
 #[allow(unrooted_must_root)]
 #[derive(MallocSizeOf)]
-#[must_root]
 // If you're renaming or moving this field, update the path in plugins::reflector as well
 pub struct Reflector {
     #[ignore_malloc_size_of = "defined and measured in rust-mozjs"]

collector/benchmarks/script-servo/components/script/dom/bindings/root.rs

@@ -48,7 +48,6 @@ use style::thread_state;
 
 /// A rooted value.
 #[allow(unrooted_must_root)]
-#[allow_unrooted_interior]
 pub struct Root<T: StableTraceObject> {
     /// The value to root.
     value: T,
@@ -310,7 +309,6 @@ impl<'root, T: RootedReference<'root> + 'root> RootedReference<'root> for Option
 /// on the stack, the `Dom<T>` can point to freed memory.
 ///
 /// This should only be used as a field in other DOM objects.
-#[must_root]
 pub struct Dom<T> {
     ptr: NonZero<*const T>,
 }
@@ -372,7 +370,6 @@ unsafe impl<T: DomObject> JSTraceable for Dom<T> {
 
 /// An unrooted reference to a DOM object for use in layout. `Layout*Helpers`
 /// traits must be implemented on this.
-#[allow_unrooted_interior]
 pub struct LayoutDom<T> {
     ptr: NonZero<*const T>,
 }
@@ -484,7 +481,6 @@ impl LayoutDom<Node> {
 ///
 /// This should only be used as a field in other DOM objects; see warning
 /// on `Dom<T>`.
-#[must_root]
 #[derive(JSTraceable)]
 pub struct MutDom<T: DomObject> {
     val: UnsafeCell<Dom<T>>,
@@ -545,7 +541,6 @@ impl<T: DomObject + PartialEq> PartialEq<T> for MutDom<T> {
 ///
 /// This should only be used as a field in other DOM objects; see warning
 /// on `Dom<T>`.
-#[must_root]
 #[derive(JSTraceable)]
 pub struct MutNullableDom<T: DomObject> {
     ptr: UnsafeCell<Option<Dom<T>>>,
@@ -648,7 +643,6 @@ impl<T: DomObject> MallocSizeOf for MutNullableDom<T> {
 ///
 /// This should only be used as a field in other DOM objects; see warning
 /// on `Dom<T>`.
-#[must_root]
 pub struct DomOnceCell<T: DomObject> {
     ptr: OnceCell<Dom<T>>,
 }

collector/benchmarks/script-servo/components/script/dom/bindings/trace.rs

@@ -750,7 +750,6 @@ impl<'a, T: JSTraceable + 'static> Drop for RootedTraceable<'a, T> {
 /// If you have GC things like *mut JSObject or JSVal, use rooted!.
 /// If you have an arbitrary number of DomObjects to root, use rooted_vec!.
 /// If you know what you're doing, use this.
-#[allow_unrooted_interior]
 pub struct RootedTraceableBox<T: 'static + JSTraceable> {
     ptr: *mut T,
 }
@@ -812,7 +811,6 @@ impl<T: JSTraceable + 'static> Drop for RootedTraceableBox<T> {
 /// iterator of `DomRoot`s, `rooted_vec!(let v <- iterator);`.
 #[allow(unrooted_must_root)]
 #[derive(JSTraceable)]
-#[allow_unrooted_interior]
 pub struct RootableVec<T: JSTraceable> {
     v: Vec<T>,
 }
@@ -827,7 +825,6 @@ impl<T: JSTraceable> RootableVec<T> {
 }
 
 /// A vector of items that are rooted for the lifetime 'a.
-#[allow_unrooted_interior]
 pub struct RootedVec<'a, T: 'static + JSTraceable> {
     root: &'a mut RootableVec<T>,
 }

collector/benchmarks/script-servo/components/script/dom/bindings/weakref.rs

@@ -30,13 +30,11 @@ use std::ops::{Deref, DerefMut, Drop};
 pub const DOM_WEAK_SLOT: u32 = 1;
 
 /// A weak reference to a JS-managed DOM object.
-#[allow_unrooted_interior]
 pub struct WeakRef<T: WeakReferenceable> {
     ptr: NonZero<*mut WeakBox<T>>,
 }
 
 /// The inner box of weak references, public for the finalization in codegen.
-#[must_root]
 pub struct WeakBox<T: WeakReferenceable> {
     /// The reference count. When it reaches zero, the `value` field should
     /// have already been set to `None`. The pointee contributes one to the count.
@@ -209,7 +207,6 @@ unsafe impl<T: WeakReferenceable> JSTraceable for MutableWeakRef<T> {
 
 /// A vector of weak references. On tracing, the vector retains
 /// only references which still point to live objects.
-#[allow_unrooted_interior]
 #[derive(MallocSizeOf)]
 pub struct WeakRefVec<T: WeakReferenceable> {
     vec: Vec<WeakRef<T>>,
@@ -256,7 +253,6 @@ impl<T: WeakReferenceable> DerefMut for WeakRefVec<T> {
 
 /// An entry of a vector of weak references. Passed to the closure
 /// given to `WeakRefVec::update`.
-#[allow_unrooted_interior]
 pub struct WeakRefEntry<'a, T: WeakReferenceable + 'a> {
     vec: &'a mut WeakRefVec<T>,
     index: &'a mut usize,

collector/benchmarks/script-servo/components/script/dom/blob.rs

@@ -33,7 +33,6 @@ pub struct FileBlob {
 
 
 /// Different backends of Blob
-#[must_root]
 #[derive(JSTraceable)]
 pub enum BlobImpl {
     /// File-based blob, whose content lives in the net process

collector/benchmarks/script-servo/components/script/dom/canvasrenderingcontext2d.rs

@@ -50,7 +50,6 @@ use std::str::FromStr;
 use std::sync::Arc;
 use unpremultiplytable::UNPREMULTIPLY_TABLE;
 
-#[must_root]
 #[derive(Clone, JSTraceable, MallocSizeOf)]
 #[allow(dead_code)]
 enum CanvasFillOrStrokeStyle {
@@ -80,7 +79,6 @@ pub struct CanvasRenderingContext2D {
     origin_clean: Cell<bool>,
 }
 
-#[must_root]
 #[derive(Clone, JSTraceable, MallocSizeOf)]
 struct CanvasContextState {
     global_alpha: f64,

collector/benchmarks/script-servo/components/script/dom/cssstyledeclaration.rs

@@ -34,7 +34,6 @@ pub struct CSSStyleDeclaration {
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub enum CSSStyleOwner {
     Element(Dom<Element>),
     CSSRule(Dom<CSSRule>,

collector/benchmarks/script-servo/components/script/dom/customelementregistry.rs

@@ -581,7 +581,6 @@ pub fn try_upgrade_element(element: &Element) {
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub enum CustomElementReaction {
     Upgrade(
         #[ignore_malloc_size_of = "Rc"]
@@ -625,7 +624,6 @@ enum BackupElementQueueFlag {
 
 /// <https://html.spec.whatwg.org/multipage/#custom-element-reactions-stack>
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct CustomElementReactionStack {
     stack: DomRefCell<Vec<ElementQueue>>,
     backup_queue: ElementQueue,
@@ -774,7 +772,6 @@ impl CustomElementReactionStack {
 
 /// <https://html.spec.whatwg.org/multipage/#element-queue>
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 struct ElementQueue {
     queue: DomRefCell<VecDeque<Dom<Element>>>,
 }

collector/benchmarks/script-servo/components/script/dom/document.rs

@@ -204,7 +204,6 @@ impl PendingRestyle {
 }
 
 #[derive(Clone, JSTraceable, MallocSizeOf)]
-#[must_root]
 struct StyleSheetInDocument {
     #[ignore_malloc_size_of = "Arc"]
     sheet: Arc<Stylesheet>,
@@ -4026,7 +4025,6 @@ impl AnimationFrameCallback {
 }
 
 #[derive(Default, JSTraceable, MallocSizeOf)]
-#[must_root]
 struct PendingInOrderScriptVec {
     scripts: DomRefCell<VecDeque<PendingScript>>,
 }
@@ -4059,7 +4057,6 @@ impl PendingInOrderScriptVec {
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 struct PendingScript {
     element: Dom<HTMLScriptElement>,
     load: Option<ScriptResult>,

collector/benchmarks/script-servo/components/script/dom/htmlcanvaselement.rs

@@ -43,7 +43,6 @@ use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 const DEFAULT_WIDTH: u32 = 300;
 const DEFAULT_HEIGHT: u32 = 150;
 
-#[must_root]
 #[derive(Clone, JSTraceable, MallocSizeOf)]
 pub enum CanvasContext {
     Context2d(Dom<CanvasRenderingContext2D>),

collector/benchmarks/script-servo/components/script/dom/htmlimageelement.rs

@@ -106,7 +106,6 @@ enum ImageRequestPhase {
     Current
 }
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 struct ImageRequest {
     state: State,
     parsed_url: Option<ServoUrl>,

collector/benchmarks/script-servo/components/script/dom/htmlinputelement.rs

@@ -102,7 +102,6 @@ pub struct HTMLInputElement {
 }
 
 #[derive(JSTraceable)]
-#[must_root]
 #[derive(MallocSizeOf)]
 struct InputActivationState {
     indeterminate: bool,

collector/benchmarks/script-servo/components/script/dom/nodelist.rs

@@ -13,7 +13,6 @@ use dom_struct::dom_struct;
 use std::cell::Cell;
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub enum NodeListType {
     Simple(Vec<Dom<Node>>),
     Children(ChildrenList),
@@ -110,7 +109,6 @@ impl NodeList {
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct ChildrenList {
     node: Dom<Node>,
     #[ignore_malloc_size_of = "Defined in rust-mozjs"]

collector/benchmarks/script-servo/components/script/dom/paintworkletglobalscope.rs

@@ -465,7 +465,6 @@ pub enum PaintWorkletTask {
 /// This type is dangerous, because it contains uboxed `Heap<JSVal>` values,
 /// which can't be moved.
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 struct PaintDefinition {
     class_constructor: Heap<JSVal>,
     paint_function: Heap<JSVal>,

collector/benchmarks/script-servo/components/script/dom/range.rs

@@ -934,7 +934,6 @@ impl RangeMethods for Range {
 }
 
 #[derive(DenyPublicFields, JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct BoundaryPoint {
     node: MutDom<Node>,
     offset: Cell<u32>,

collector/benchmarks/script-servo/components/script/dom/servoparser/async_html.rs

@@ -166,7 +166,6 @@ fn create_buffer_queue(mut buffers: VecDeque<SendTendril<UTF8>>) -> BufferQueue
 //   |_____________|                         |_______________|
 //
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct Tokenizer {
     document: Dom<Document>,
     #[ignore_malloc_size_of = "Defined in std"]

collector/benchmarks/script-servo/components/script/dom/servoparser/html.rs

@@ -29,7 +29,6 @@ use servo_url::ServoUrl;
 use std::io;
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct Tokenizer {
     #[ignore_malloc_size_of = "Defined in html5ever"]
     inner: HtmlTokenizer<TreeBuilder<Dom<Node>, Sink>>,

collector/benchmarks/script-servo/components/script/dom/servoparser/mod.rs

@@ -497,7 +497,6 @@ enum ParserKind {
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 enum Tokenizer {
     Html(self::html::Tokenizer),
     AsyncHtml(self::async_html::Tokenizer),
@@ -740,7 +739,6 @@ fn insert(parent: &Node, reference_child: Option<&Node>, child: NodeOrText<Dom<N
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct Sink {
     base_url: ServoUrl,
     document: Dom<Document>,

collector/benchmarks/script-servo/components/script/dom/servoparser/xml.rs

@@ -17,7 +17,6 @@ use xml5ever::tokenizer::XmlTokenizer;
 use xml5ever::tree_builder::{Tracer as XmlTracer, XmlTreeBuilder};
 
 #[derive(JSTraceable, MallocSizeOf)]
-#[must_root]
 pub struct Tokenizer {
     #[ignore_malloc_size_of = "Defined in xml5ever"]
     inner: XmlTokenizer<XmlTreeBuilder<Dom<Node>, Sink>>,

collector/benchmarks/script-servo/components/script/dom/webgl_extensions/extensions.rs

@@ -82,7 +82,6 @@ impl WebGLExtensionFeatures {
 }
 
 /// Handles the list of implemented, supported and enabled WebGL extensions.
-#[must_root]
 #[derive(JSTraceable, MallocSizeOf)]
 pub struct WebGLExtensions {
     extensions: DomRefCell<HashMap<String, Box<WebGLExtensionWrapper>>>,

collector/benchmarks/script-servo/components/script/dom/webgl_extensions/wrapper.rs

@@ -26,7 +26,6 @@ pub trait WebGLExtensionWrapper: JSTraceable + MallocSizeOf {
     fn as_any(&self) -> &Any;
 }
 
-#[must_root]
 #[derive(JSTraceable, MallocSizeOf)]
 pub struct TypedWebGLExtensionWrapper<T: WebGLExtension> {
     extension: MutNullableDom<T::Extension>

collector/benchmarks/script-servo/components/script/dom/webglframebuffer.rs

@@ -18,7 +18,6 @@ use dom::window::Window;
 use dom_struct::dom_struct;
 use std::cell::Cell;
 
-#[must_root]
 #[derive(Clone, JSTraceable, MallocSizeOf)]
 enum WebGLFramebufferAttachment {
     Renderbuffer(Dom<WebGLRenderbuffer>),