Remove helper traits

Now that JSRef<T> is gone, there is no need to have helper traits.

On components/script/*.rs:

    # Remove imports.
    /^ *use dom::[a-z]+::\{.*Helpers/ {
        s/\{(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers, /\{/
        s/, (Raw[^L]|[^L][^a])[a-zA-Z]+Helpers([,}])/\2/g
        s/\{([a-zA-Z]+)\}/\1/
        /\{\}/d
        s/::self;$/;/
    }
    /^ *use dom::[a-z]+::\{?(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers\}?;$/d

On components/script/dom/*.rs:

    # Ignore layout things.
    /^(pub )?(impl|trait).*Layout.* \{/,/^}$/ { P; D; }

    # Delete helpers traits.
    /^(pub )?trait ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? \{$/,/^\}$/D

    # Patch private helpers.
    /^impl.*Private.*Helpers/,/^\}$/ {
        s/^impl<'a> Private([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for &'a ([^ ]+) \{$/impl \3 {/
        /^ *(unsafe )?fn .*\(self.*[<&]'a/ {
            s/&'a /\&/g
            s/<'a, /</g
        }
        /^ *(unsafe )?fn /s/\(self([,)])/\(\&self\1/
    }

    # Patch public helpers.
    /^impl.*Helpers/,/^\}$/ {
        s/^impl(<'a>)? ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for (&'a )?([^ ]+) \{$/impl \5 {/
        /^ *(unsafe )?fn .*\(self.*[<&]'a/ {
            s/&'a /\&/g
            s/<'a, /</g
        }
        /^ *(unsafe )?fn .*\(&?self[,)]/s/(unsafe )?fn/pub &/
        /^ *pub (unsafe )?fn /s/\(self([,)])/\(\&self\1/
    }

The few error cases were then fixed by hand.

1 files changed, 7 insertions, 22 deletions

diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs
index 2450b4c8aa3..bfaa5590f3c 100644
--- a/components/script/dom/servohtmlparser.rs
+++ b/components/script/dom/servohtmlparser.rs
@@ -13,7 +13,7 @@ use dom::bindings::js::{JS, Root};
 use dom::bindings::refcounted::Trusted;
 use dom::bindings::trace::JSTraceable;
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use dom::document::{Document, DocumentHelpers};
+use dom::document::Document;
 use dom::node::{window_from_node, Node};
 use dom::window::Window;
 use network_listener::PreInvoke;
@@ -272,16 +272,9 @@ impl ServoHTMLParser {
     }
 }
 
-trait PrivateServoHTMLParserHelpers {
-    /// Synchronously run the tokenizer parse loop until explicitly suspended or
-    /// the tokenizer runs out of input.
-    fn parse_sync(self);
-    /// Retrieve the window object associated with this parser.
-    fn window(self) -> Root<Window>;
-}
 
-impl<'a> PrivateServoHTMLParserHelpers for &'a ServoHTMLParser {
-    fn parse_sync(self) {
+impl ServoHTMLParser {
+    fn parse_sync(&self) {
         let mut first = true;
 
         // This parser will continue to parse while there is either pending input or
@@ -314,28 +307,20 @@ impl<'a> PrivateServoHTMLParserHelpers for &'a ServoHTMLParser {
         }
     }
 
-    fn window(self) -> Root<Window> {
+    fn window(&self) -> Root<Window> {
         let doc = self.document.root();
         window_from_node(doc.r())
     }
 }
 
-pub trait ServoHTMLParserHelpers {
-    /// Cause the parser to interrupt next time the tokenizer reaches a quiescent state.
-    /// No further parsing will occur after that point until the `resume` method is called.
-    /// Panics if the parser is already suspended.
-    fn suspend(self);
-    /// Immediately resume a suspended parser. Panics if the parser is not suspended.
-    fn resume(self);
-}
 
-impl<'a> ServoHTMLParserHelpers for &'a ServoHTMLParser {
-    fn suspend(self) {
+impl ServoHTMLParser {
+    pub fn suspend(&self) {
         assert!(!self.suspended.get());
         self.suspended.set(true);
     }
 
-    fn resume(self) {
+    pub fn resume(&self) {
         assert!(self.suspended.get());
         self.suspended.set(false);
         self.parse_sync();