Remove intrinsic Root::r()

This commit is contained in:
Anthony Ramine 2016-05-13 14:20:00 +02:00
parent 51bcf516c8
commit 0b3ab875f4
55 changed files with 275 additions and 310 deletions

View file

@ -107,12 +107,12 @@ impl NodeIteratorMethods for NodeIterator {
before_node = false;
// Step 3-2.
let result = try!(self.accept_node(node.r()));
let result = try!(self.accept_node(&node));
// Step 3-3.
if result == NodeFilterConstants::FILTER_ACCEPT {
// Step 4.
self.reference_node.set(node.r());
self.reference_node.set(&node);
self.pointer_before_reference_node.set(before_node);
return Ok(Some(node));
@ -122,12 +122,12 @@ impl NodeIteratorMethods for NodeIterator {
// Step 3-1.
for following_node in node.following_nodes(&self.root_node) {
// Step 3-2.
let result = try!(self.accept_node(following_node.r()));
let result = try!(self.accept_node(&following_node));
// Step 3-3.
if result == NodeFilterConstants::FILTER_ACCEPT {
// Step 4.
self.reference_node.set(following_node.r());
self.reference_node.set(&following_node);
self.pointer_before_reference_node.set(before_node);
return Ok(Some(following_node));
@ -151,12 +151,12 @@ impl NodeIteratorMethods for NodeIterator {
before_node = true;
// Step 3-2.
let result = try!(self.accept_node(node.r()));
let result = try!(self.accept_node(&node));
// Step 3-3.
if result == NodeFilterConstants::FILTER_ACCEPT {
// Step 4.
self.reference_node.set(node.r());
self.reference_node.set(&node);
self.pointer_before_reference_node.set(before_node);
return Ok(Some(node));
@ -166,12 +166,12 @@ impl NodeIteratorMethods for NodeIterator {
// Step 3-1.
for preceding_node in node.preceding_nodes(&self.root_node) {
// Step 3-2.
let result = try!(self.accept_node(preceding_node.r()));
let result = try!(self.accept_node(&preceding_node));
// Step 3-3.
if result == NodeFilterConstants::FILTER_ACCEPT {
// Step 4.
self.reference_node.set(preceding_node.r());
self.reference_node.set(&preceding_node);
self.pointer_before_reference_node.set(before_node);
return Ok(Some(preceding_node));