From a83e1659e4126abba6405e58d83f4988341bd149 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 8 Oct 2012 18:15:39 -0700 Subject: [PATCH] Fix more warnings in util::tree --- src/servo/dom/node.rs | 12 ++++++------ src/servo/layout/box.rs | 8 ++++---- src/servo/layout/flow.rs | 8 ++++---- src/servo/util/tree.rs | 24 ++++++++++++------------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/servo/dom/node.rs b/src/servo/dom/node.rs index 27000617dac..442b9d51edc 100644 --- a/src/servo/dom/node.rs +++ b/src/servo/dom/node.rs @@ -31,8 +31,8 @@ impl NodeTree : tree::ReadMethods { tree::each_child(&self, node, f) } - fn with_tree_fields(&&n: Node, f: fn(tree::Tree) -> R) -> R { - n.read(|n| f(n.tree)) + fn with_tree_fields(n: &Node, f: fn(&tree::Tree) -> R) -> R { + n.read(|n| f(&n.tree)) } } @@ -161,8 +161,8 @@ impl NodeScope : tree::ReadMethods { tree::get_parent(&self, node) } - fn with_tree_fields(node: Node, f: fn(tree::Tree) -> R) -> R { - self.read(node, |n| f(n.tree)) + fn with_tree_fields(node: &Node, f: fn(&tree::Tree) -> R) -> R { + self.read(*node, |n| f(&n.tree)) } } @@ -172,7 +172,7 @@ impl NodeScope : tree::WriteMethods { tree::add_child(&self, node, child) } - fn with_tree_fields(node: Node, f: fn(tree::Tree) -> R) -> R { - self.write(node, |n| f(n.tree)) + fn with_tree_fields(node: &Node, f: fn(&tree::Tree) -> R) -> R { + self.write(*node, |n| f(&n.tree)) } } diff --git a/src/servo/layout/box.rs b/src/servo/layout/box.rs index 9f497ac64cf..8b94ce85394 100644 --- a/src/servo/layout/box.rs +++ b/src/servo/layout/box.rs @@ -312,8 +312,8 @@ impl RenderBoxTree : tree::ReadMethods<@RenderBox> { tree::each_child(&self, &node, |box| f(*box) ) } - fn with_tree_fields(&&b: @RenderBox, f: fn(tree::Tree<@RenderBox>) -> R) -> R { - f(b.d().tree) + fn with_tree_fields(b: &@RenderBox, f: fn(&tree::Tree<@RenderBox>) -> R) -> R { + f(&b.d().tree) } } @@ -323,8 +323,8 @@ impl RenderBoxTree : tree::WriteMethods<@RenderBox> { tree::add_child(&self, parent, child) } - fn with_tree_fields(&&b: @RenderBox, f: fn(tree::Tree<@RenderBox>) -> R) -> R { - f(b.d().tree) + fn with_tree_fields(b: &@RenderBox, f: fn(&tree::Tree<@RenderBox>) -> R) -> R { + f(&b.d().tree) } } diff --git a/src/servo/layout/flow.rs b/src/servo/layout/flow.rs index 9020658d0f1..ccb675dfc36 100644 --- a/src/servo/layout/flow.rs +++ b/src/servo/layout/flow.rs @@ -217,8 +217,8 @@ impl FlowTree : tree::ReadMethods<@FlowContext> { tree::each_child(&self, &ctx, |box| f(*box) ) } - fn with_tree_fields(&&box: @FlowContext, f: fn(tree::Tree<@FlowContext>) -> R) -> R { - f(box.d().tree) + fn with_tree_fields(box: &@FlowContext, f: fn(&tree::Tree<@FlowContext>) -> R) -> R { + f(&box.d().tree) } } @@ -228,8 +228,8 @@ impl FlowTree : tree::WriteMethods<@FlowContext> { tree::add_child(&self, parent, child) } - fn with_tree_fields(&&box: @FlowContext, f: fn(tree::Tree<@FlowContext>) -> R) -> R { - f(box.d().tree) + fn with_tree_fields(box: &@FlowContext, f: fn(&tree::Tree<@FlowContext>) -> R) -> R { + f(&box.d().tree) } } diff --git a/src/servo/util/tree.rs b/src/servo/util/tree.rs index 5e316b9f9c8..6a63a7ac917 100644 --- a/src/servo/util/tree.rs +++ b/src/servo/util/tree.rs @@ -13,21 +13,21 @@ pub type Tree = { }; pub trait ReadMethods { - fn with_tree_fields(T, f: fn(Tree) -> R) -> R; + fn with_tree_fields(&T, f: fn(&Tree) -> R) -> R; } pub trait WriteMethods { - fn with_tree_fields(T, f: fn(Tree) -> R) -> R; + fn with_tree_fields(&T, f: fn(&Tree) -> R) -> R; } pub fn each_child>(ops: &O, node: &T, f: fn(&T) -> bool) { - let mut p = ops.with_tree_fields(*node, |f| f.first_child); + let mut p = ops.with_tree_fields(node, |f| f.first_child); loop { match copy p { None => { return; } Some(ref c) => { if !f(c) { return; } - p = ops.with_tree_fields(*c, |f| f.next_sibling); + p = ops.with_tree_fields(c, |f| f.next_sibling); } } } @@ -43,7 +43,7 @@ pub fn empty() -> Tree { pub fn add_child>(ops: &O, +parent: T, +child: T) { - ops.with_tree_fields(child, |child_tf| { + ops.with_tree_fields(&child, |child_tf| { match child_tf.parent { Some(_) => { fail ~"Already has a parent"; } None => { child_tf.parent = Some(parent); } @@ -52,14 +52,14 @@ pub fn add_child>(ops: &O, +parent: T, +child: T) { assert child_tf.prev_sibling.is_none(); assert child_tf.next_sibling.is_none(); - ops.with_tree_fields(parent, |parent_tf| { + ops.with_tree_fields(&parent, |parent_tf| { match copy parent_tf.last_child { None => { parent_tf.first_child = Some(child); } Some(lc) => { let lc = lc; // satisfy alias checker - ops.with_tree_fields(lc, |lc_tf| { + ops.with_tree_fields(&lc, |lc_tf| { assert lc_tf.next_sibling.is_none(); lc_tf.next_sibling = Some(child); }); @@ -73,7 +73,7 @@ pub fn add_child>(ops: &O, +parent: T, +child: T) { } pub fn get_parent>(ops: &O, node: &T) -> Option { - ops.with_tree_fields(*node, |tf| tf.parent) + ops.with_tree_fields(node, |tf| tf.parent) } #[cfg(test)] @@ -86,14 +86,14 @@ mod test { enum dtree { dtree } impl dtree : ReadMethods { - fn with_tree_fields(d: dummy, f: fn(Tree) -> R) -> R { - f(d.fields) + fn with_tree_fields(d: &dummy, f: fn(&Tree) -> R) -> R { + f(&d.fields) } } impl dtree : WriteMethods { - fn with_tree_fields(d: dummy, f: fn(Tree) -> R) -> R { - f(d.fields) + fn with_tree_fields(d: &dummy, f: fn(&Tree) -> R) -> R { + f(&d.fields) } }