From 33dd596ab4c8082efcb1ea53c6cb74f2c38e769c Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Wed, 15 Apr 2015 11:15:55 -0700
Subject: [PATCH] Remove graph.Err helper function

Since Err() is now a member of the Iterator interface, we don't need
this helper function anymore.
---
 graph/iterator.go                           | 11 -----------
 graph/iterator/and_iterator.go              |  2 +-
 graph/iterator/hasa_iterator.go             |  2 +-
 graph/iterator/linksto_iterator.go          |  2 +-
 graph/iterator/materialize_iterator.go      |  4 ++--
 graph/iterator/not_iterator.go              |  2 +-
 graph/iterator/or_iterator.go               |  2 +-
 graph/iterator/value_comparison_iterator.go |  2 +-
 8 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/graph/iterator.go b/graph/iterator.go
index 46cc9f9..9204c5c 100644
--- a/graph/iterator.go
+++ b/graph/iterator.go
@@ -177,17 +177,6 @@ func Next(it Iterator) bool {
 	return false
 }
 
-// Err is a convenience function that conditionally calls the Err method
-// of an Iterator if it is a Nexter.  If the Iterator is not a Nexter, Err
-// returns nil.
-func Err(it Iterator) error {
-	if n, ok := it.(Nexter); ok {
-		return n.Err()
-	}
-	glog.Errorln("Calling Err on an un-nextable iterator")
-	return nil
-}
-
 // Height is a convienence function to measure the height of an iterator tree.
 func Height(it Iterator, until Type) int {
 	if it.Type() == until {
diff --git a/graph/iterator/and_iterator.go b/graph/iterator/and_iterator.go
index 956c21c..f7da02f 100644
--- a/graph/iterator/and_iterator.go
+++ b/graph/iterator/and_iterator.go
@@ -154,7 +154,7 @@ func (it *And) Next() bool {
 			return graph.NextLogOut(it, curr, true)
 		}
 	}
-	if err := graph.Err(it.primaryIt); err != nil {
+	if err := it.primaryIt.Err(); err != nil {
 		it.err = err
 	}
 	return graph.NextLogOut(it, nil, false)
diff --git a/graph/iterator/hasa_iterator.go b/graph/iterator/hasa_iterator.go
index 21dbb16..f9f555b 100644
--- a/graph/iterator/hasa_iterator.go
+++ b/graph/iterator/hasa_iterator.go
@@ -203,7 +203,7 @@ func (it *HasA) Next() bool {
 	it.resultIt = &Null{}
 
 	if !graph.Next(it.primaryIt) {
-		if err := graph.Err(it.primaryIt); err != nil {
+		if err := it.primaryIt.Err(); err != nil {
 			it.err = err
 		}
 		return graph.NextLogOut(it, 0, false)
diff --git a/graph/iterator/linksto_iterator.go b/graph/iterator/linksto_iterator.go
index 005fc37..16affac 100644
--- a/graph/iterator/linksto_iterator.go
+++ b/graph/iterator/linksto_iterator.go
@@ -166,7 +166,7 @@ func (it *LinksTo) Next() bool {
 	}
 
 	// If there's an error in the 'next' iterator, we save it and we're done.
-	if err := graph.Err(it.nextIt); err != nil {
+	if err := it.nextIt.Err(); err != nil {
 		it.err = err
 		return false
 	}
diff --git a/graph/iterator/materialize_iterator.go b/graph/iterator/materialize_iterator.go
index 2b8a464..cff1c88 100644
--- a/graph/iterator/materialize_iterator.go
+++ b/graph/iterator/materialize_iterator.go
@@ -206,7 +206,7 @@ func (it *Materialize) Next() bool {
 	}
 	if it.aborted {
 		n := graph.Next(it.subIt)
-		if err := graph.Err(it.subIt); err != nil {
+		if err := it.subIt.Err(); err != nil {
 			it.err = err
 		}
 		return n
@@ -296,7 +296,7 @@ func (it *Materialize) materializeSet() {
 			it.actualSize += 1
 		}
 	}
-	if err := graph.Err(it.subIt); err != nil {
+	if err := it.subIt.Err(); err != nil {
 		it.err = err
 	} else if it.aborted {
 		if glog.V(2) {
diff --git a/graph/iterator/not_iterator.go b/graph/iterator/not_iterator.go
index 3bee077..2617a98 100644
--- a/graph/iterator/not_iterator.go
+++ b/graph/iterator/not_iterator.go
@@ -88,7 +88,7 @@ func (it *Not) Next() bool {
 			return graph.NextLogOut(it, curr, true)
 		}
 	}
-	if err := graph.Err(it.allIt); err != nil {
+	if err := it.allIt.Err(); err != nil {
 		it.err = err
 	}
 	return graph.NextLogOut(it, nil, false)
diff --git a/graph/iterator/or_iterator.go b/graph/iterator/or_iterator.go
index 0093eb5..e5b4e09 100644
--- a/graph/iterator/or_iterator.go
+++ b/graph/iterator/or_iterator.go
@@ -148,7 +148,7 @@ func (it *Or) Next() bool {
 			return graph.NextLogOut(it, it.result, true)
 		}
 
-		if err := graph.Err(curIt); err != nil {
+		if err := curIt.Err(); err != nil {
 			it.err = err
 			return graph.NextLogOut(it, nil, false)
 		}
diff --git a/graph/iterator/value_comparison_iterator.go b/graph/iterator/value_comparison_iterator.go
index 0299fdd..9197172 100644
--- a/graph/iterator/value_comparison_iterator.go
+++ b/graph/iterator/value_comparison_iterator.go
@@ -134,7 +134,7 @@ func (it *Comparison) Next() bool {
 			return true
 		}
 	}
-	if err := graph.Err(it.subIt); err != nil {
+	if err := it.subIt.Err(); err != nil {
 		it.err = err
 	}
 	return false