Remove deprecated ResultTree API

graph/iterator/all_iterator.go

@@ -109,11 +109,6 @@ func (it *Int64) Err() error {
 	return nil
 }
 
-// DEPRECATED
-func (it *Int64) ResultTree() *graph.ResultTree {
-	return graph.NewResultTree(it.Result())
-}
-
 func (it *Int64) Result() graph.Value {
 	return it.result
 }

graph/iterator/and_iterator.go

@@ -102,16 +102,6 @@ func (it *And) SubIterators() []graph.Iterator {
 	return iters
 }
 
-// DEPRECATED Returns the ResultTree for this iterator, recurses to it's subiterators.
-func (it *And) ResultTree() *graph.ResultTree {
-	tree := graph.NewResultTree(it.Result())
-	tree.AddSubtree(it.primaryIt.ResultTree())
-	for _, sub := range it.internalIterators {
-		tree.AddSubtree(sub.ResultTree())
-	}
-	return tree
-}
-
 func (it *And) Describe() graph.Description {
 	subIts := make([]graph.Description, len(it.internalIterators))
 	for i, sub := range it.internalIterators {

graph/iterator/fixed_iterator.go

@@ -149,11 +149,6 @@ func (it *Fixed) Err() error {
 	return nil
 }
 
-// DEPRECATED
-func (it *Fixed) ResultTree() *graph.ResultTree {
-	return graph.NewResultTree(it.Result())
-}
-
 func (it *Fixed) Result() graph.Value {
 	return it.result
 }

graph/iterator/hasa_iterator.go

@@ -121,13 +121,6 @@ func (it *HasA) TagResults(dst map[string]graph.Value) {
 	it.primaryIt.TagResults(dst)
 }
 
-// DEPRECATED Return results in a ResultTree.
-func (it *HasA) ResultTree() *graph.ResultTree {
-	tree := graph.NewResultTree(it.Result())
-	tree.AddSubtree(it.primaryIt.ResultTree())
-	return tree
-}
-
 func (it *HasA) Describe() graph.Description {
 	primary := it.primaryIt.Describe()
 	return graph.Description{

graph/iterator/iterator.go

@@ -96,10 +96,6 @@ func (it *Null) Result() graph.Value {
 	return nil
 }
 
-func (it *Null) ResultTree() *graph.ResultTree {
-	return graph.NewResultTree(it.Result())
-}
-
 func (it *Null) SubIterators() []graph.Iterator {
 	return nil
 }

graph/iterator/linksto_iterator.go

@@ -99,13 +99,6 @@ func (it *LinksTo) TagResults(dst map[string]graph.Value) {
 	it.primaryIt.TagResults(dst)
 }
 
-// DEPRECATED
-func (it *LinksTo) ResultTree() *graph.ResultTree {
-	tree := graph.NewResultTree(it.Result())
-	tree.AddSubtree(it.primaryIt.ResultTree())
-	return tree
-}
-
 func (it *LinksTo) Describe() graph.Description {
 	primary := it.primaryIt.Describe()
 	return graph.Description{

graph/iterator/materialize_iterator.go

@@ -131,13 +131,6 @@ func (it *Materialize) Describe() graph.Description {
 // Register this iterator as a Materialize iterator.
 func (it *Materialize) Type() graph.Type { return graph.Materialize }
 
-// DEPRECATED
-func (it *Materialize) ResultTree() *graph.ResultTree {
-	tree := graph.NewResultTree(it.Result())
-	tree.AddSubtree(it.subIt.ResultTree())
-	return tree
-}
-
 func (it *Materialize) Result() graph.Value {
 	if it.aborted {
 		return it.subIt.Result()

graph/iterator/not_iterator.go

@@ -66,14 +66,6 @@ func (it *Not) SubIterators() []graph.Iterator {
 	return []graph.Iterator{it.primaryIt, it.allIt}
 }
 
-// DEPRECATED
-func (it *Not) ResultTree() *graph.ResultTree {
-	tree := graph.NewResultTree(it.Result())
-	tree.AddSubtree(it.primaryIt.ResultTree())
-	tree.AddSubtree(it.allIt.ResultTree())
-	return tree
-}
-
 // Next advances the Not iterator. It returns whether there is another valid
 // new value. It fetches the next value of the all iterator which is not
 // contained by the primary iterator.

graph/iterator/optional_iterator.go

@@ -72,11 +72,6 @@ func (it *Optional) Clone() graph.Iterator {
 	return out
 }
 
-// DEPRECATED
-func (it *Optional) ResultTree() *graph.ResultTree {
-	return graph.NewResultTree(it.Result())
-}
-
 func (it *Optional) Err() error {
 	return it.err
 }

graph/iterator/or_iterator.go

@@ -102,15 +102,6 @@ func (it *Or) TagResults(dst map[string]graph.Value) {
 	it.internalIterators[it.currentIterator].TagResults(dst)
 }
 
-// DEPRECATED Returns the ResultTree for this graph.iterator, recurses to it's subiterators.
-func (it *Or) ResultTree() *graph.ResultTree {
-	tree := graph.NewResultTree(it.Result())
-	for _, sub := range it.internalIterators {
-		tree.AddSubtree(sub.ResultTree())
-	}
-	return tree
-}
-
 func (it *Or) Describe() graph.Description {
 	var subIts []graph.Description
 	for i, sub := range it.internalIterators {

graph/iterator/unique_iterator.go

@@ -64,13 +64,6 @@ func (it *Unique) SubIterators() []graph.Iterator {
 	return []graph.Iterator{it.subIt}
 }
 
-// DEPRECATED
-func (it *Unique) ResultTree() *graph.ResultTree {
-	tree := graph.NewResultTree(it.Result())
-	tree.AddSubtree(it.subIt.ResultTree())
-	return tree
-}
-
 // Next advances the subiterator, continuing until it returns a value which it
 // has not previously seen.
 func (it *Unique) Next() bool {

graph/iterator/value_comparison_iterator.go

@@ -140,11 +140,6 @@ func (it *Comparison) Err() error {
 	return it.err
 }
 
-// DEPRECATED
-func (it *Comparison) ResultTree() *graph.ResultTree {
-	return graph.NewResultTree(it.Result())
-}
-
 func (it *Comparison) Result() graph.Value {
 	return it.result
 }