From c831c2c0a528b6a04b355cc51169023f8c29b761 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Thu, 27 Aug 2015 01:22:42 +0200
Subject: 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.
---
 components/script/dom/nodeiterator.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'components/script/dom/nodeiterator.rs')

diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs
index ec12b951b23..c45e84e182f 100644
--- a/components/script/dom/nodeiterator.rs
+++ b/components/script/dom/nodeiterator.rs
@@ -12,8 +12,8 @@ use dom::bindings::error::Fallible;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JS, MutHeap, Root};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use dom::document::{Document, DocumentHelpers};
-use dom::node::{Node, NodeHelpers};
+use dom::document::Document;
+use dom::node::Node;
 
 use std::cell::Cell;
 use std::rc::Rc;
@@ -191,14 +191,10 @@ impl<'a> NodeIteratorMethods for &'a NodeIterator {
     }
 }
 
-trait PrivateNodeIteratorHelpers {
-    fn accept_node(self, node: &Node) -> Fallible<u16>;
-    fn is_root_node(self, node: &Node) -> bool;
-}
 
-impl<'a> PrivateNodeIteratorHelpers for &'a NodeIterator {
+impl NodeIterator {
     // https://dom.spec.whatwg.org/#concept-node-filter
-    fn accept_node(self, node: &Node) -> Fallible<u16> {
+    fn accept_node(&self, node: &Node) -> Fallible<u16> {
         // Step 1.
         let n = node.NodeType() - 1;
         // Step 2.
@@ -213,7 +209,7 @@ impl<'a> PrivateNodeIteratorHelpers for &'a NodeIterator {
         }
     }
 
-    fn is_root_node(self, node: &Node) -> bool {
+    fn is_root_node(&self, node: &Node) -> bool {
         JS::from_ref(node) == self.root_node
     }
 }
-- 
cgit v1.2.3


From 275907f256814e492c53086f455938f11fedaf42 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Thu, 27 Aug 2015 01:55:47 +0200
Subject: Remove dead code that surfaced when moved outside helper trait

---
 components/script/dom/nodeiterator.rs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'components/script/dom/nodeiterator.rs')

diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs
index c45e84e182f..31b90309c33 100644
--- a/components/script/dom/nodeiterator.rs
+++ b/components/script/dom/nodeiterator.rs
@@ -208,10 +208,6 @@ impl NodeIterator {
             Filter::Callback(ref callback) => callback.AcceptNode_(self, node, Rethrow)
         }
     }
-
-    fn is_root_node(&self, node: &Node) -> bool {
-        JS::from_ref(node) == self.root_node
-    }
 }
 
 
-- 
cgit v1.2.3