Added more exceptions to the plugin; servo should compile

components/script/dom/abstractworkerglobalscope.rs

@@ -13,12 +13,13 @@ use std::sync::mpsc::{Receiver, Sender};
 /// common event loop messages. While this SendableWorkerScriptChan is alive, the associated
 /// Worker object will remain alive.
 #[derive(Clone, JSTraceable)]
-pub struct SendableWorkerScriptChan<T: DomObject> {
+#[must_root]
+pub struct SendableWorkerScriptChan<#[must_root] T: DomObject> {
     pub sender: Sender<(Trusted<T>, CommonScriptMsg)>,
     pub worker: Trusted<T>,
 }
 
-impl<T: JSTraceable + DomObject + 'static> ScriptChan for SendableWorkerScriptChan<T> {
+impl<#[must_root] T: JSTraceable + DomObject + 'static> ScriptChan for SendableWorkerScriptChan<T> {
     fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
         self.sender.send((self.worker.clone(), msg)).map_err(|_| ())
     }
@@ -35,12 +36,13 @@ impl<T: JSTraceable + DomObject + 'static> ScriptChan for SendableWorkerScriptCh
 /// worker event loop messages. While this SendableWorkerScriptChan is alive, the associated
 /// Worker object will remain alive.
 #[derive(Clone, JSTraceable)]
-pub struct WorkerThreadWorkerChan<T: DomObject> {
+#[must_root]
+pub struct WorkerThreadWorkerChan<#[must_root] T: DomObject> {
     pub sender: Sender<(Trusted<T>, WorkerScriptMsg)>,
     pub worker: Trusted<T>,
 }
 
-impl<T: JSTraceable + DomObject + 'static> ScriptChan for WorkerThreadWorkerChan<T> {
+impl<#[must_root] T: JSTraceable + DomObject + 'static> ScriptChan for WorkerThreadWorkerChan<T> {
     fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
         self.sender
             .send((self.worker.clone(), WorkerScriptMsg::Common(msg)))
@@ -55,7 +57,7 @@ impl<T: JSTraceable + DomObject + 'static> ScriptChan for WorkerThreadWorkerChan
     }
 }
 
-impl<T: DomObject> ScriptPort for Receiver<(Trusted<T>, WorkerScriptMsg)> {
+impl<#[must_root] T: DomObject> ScriptPort for Receiver<(Trusted<T>, WorkerScriptMsg)> {
     fn recv(&self) -> Result<CommonScriptMsg, ()> {
         match self.recv().map(|(_, msg)| msg) {
             Ok(WorkerScriptMsg::Common(script_msg)) => Ok(script_msg),

components/script/dom/bindings/cell.rs

@@ -12,9 +12,9 @@ use style::thread_state::{self, ThreadState};
 /// This extends the API of `std::cell::RefCell` to allow unsafe access in
 /// certain situations, with dynamic checking in debug builds.
 #[derive(Clone, Debug, Default, MallocSizeOf, PartialEq)]
-#[must_root]
+//#[must_root] // TODO should it be #[must_root]? then -> there are usages with #[must_root] types and with normal ones; two different structs for them? or hacking plugin compiler further to mark structure as #[must_root] if it generic type is #[must_root]?
 pub struct DomRefCell<#[must_root] T> {
-    value: RefCell<T>,
+    value: RefCell<T>,  // TODO currently a little bit hacky since RefCell is currently on the exception list
 }
 
 // Functionality specific to Servo's `DomRefCell` type
@@ -50,6 +50,7 @@ impl<#[must_root] T> DomRefCell<T> {
 // ===================================================
 impl<#[must_root] T> DomRefCell<T> {
     /// Create a new `DomRefCell` containing `value`.
+    #[allow(unrooted_must_root)]  // TODO don't know if it is okay; T is unrooted argument
     pub fn new(value: T) -> DomRefCell<T> {
         DomRefCell {
             value: RefCell::new(value),

components/script/dom/bindings/root.rs

@@ -151,7 +151,7 @@ impl<#[must_root] T: Castable> DomRoot<T> {
 
 impl<#[must_root] T: DomObject> DomRoot<T> {
     /// Generate a new root from a reference
-    pub fn from_ref(unrooted: &T) -> DomRoot<T> {
+    pub fn from_ref(unrooted: &T) -> DomRoot<T> {  // TODO probably should be treated like "new"/"new_*" methods
         unsafe { DomRoot::new(Dom::from_ref(unrooted)) }
     }
 }

components/script/dom/textcontrol.rs

@@ -18,18 +18,19 @@ use dom::node::{Node, NodeDamage, window_from_node};
 use script_traits::ScriptToConstellationChan;
 use textinput::{SelectionDirection, SelectionState, TextInput};
 
+#[must_root]
 pub trait TextControlElement: DerivedFrom<EventTarget> + DerivedFrom<Node> {
     fn selection_api_applies(&self) -> bool;
     fn has_selectable_text(&self) -> bool;
     fn set_dirty_value_flag(&self, value: bool);
 }
 
-pub struct TextControlSelection<'a, E: TextControlElement> {
+pub struct TextControlSelection<'a, #[must_root] E: TextControlElement> {
     element: &'a E,
     textinput: &'a DomRefCell<TextInput<ScriptToConstellationChan>>,
 }
 
-impl<'a, E: TextControlElement> TextControlSelection<'a, E> {
+impl<'a, #[must_root] E: TextControlElement> TextControlSelection<'a, E> {
     pub fn new(element: &'a E, textinput: &'a DomRefCell<TextInput<ScriptToConstellationChan>>) -> Self {
         TextControlSelection { element, textinput }
     }