From a1ec0cec1164be116eb2f6b35e71b8b0e4eac42a Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 26 Apr 2014 11:19:06 +0200 Subject: [PATCH] Make TreeIterator::nodes a Vec. --- src/components/script/dom/node.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index f87d8ea6dae..37cc1553324 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -517,14 +517,14 @@ impl NodeHelpers for JS { /// Iterates over this node and all its descendants, in preorder. fn traverse_preorder(&self) -> TreeIterator { - let mut nodes = ~[]; + let mut nodes = vec!(); gather_abstract_nodes(self, &mut nodes, false); TreeIterator::new(nodes) } /// Iterates over this node and all its descendants, in postorder. fn sequential_traverse_postorder(&self) -> TreeIterator { - let mut nodes = ~[]; + let mut nodes = vec!(); gather_abstract_nodes(self, &mut nodes, true); TreeIterator::new(nodes) } @@ -633,12 +633,12 @@ impl Iterator> for AncestorIterator { // FIXME: Do this without precomputing a vector of refs. // Easy for preorder; harder for postorder. pub struct TreeIterator { - nodes: ~[JS], + nodes: Vec>, index: uint, } impl TreeIterator { - fn new(nodes: ~[JS]) -> TreeIterator { + fn new(nodes: Vec>) -> TreeIterator { TreeIterator { nodes: nodes, index: 0, @@ -651,7 +651,7 @@ impl Iterator> for TreeIterator { if self.index >= self.nodes.len() { None } else { - let v = self.nodes[self.index].clone(); + let v = self.nodes.get(self.index).clone(); self.index += 1; Some(v) } @@ -735,7 +735,7 @@ impl Iterator> for NodeIterator { } } -fn gather_abstract_nodes(cur: &JS, refs: &mut ~[JS], postorder: bool) { +fn gather_abstract_nodes(cur: &JS, refs: &mut Vec>, postorder: bool) { if !postorder { refs.push(cur.clone()); }