Merge pull request JuliaCollections#125 from sjkelly/sjk/qa1

Fix method ambiguities

Author: oscardssmith

Project.toml

@@ -7,7 +7,8 @@ version = "0.4.3"
 julia = "1"
 
 [extras]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["Aqua", "Test"]

src/AbstractTrees.jl

@@ -30,7 +30,7 @@ export ParentLinks, StoredParents, ImplicitParents
 export SiblingLinks, StoredSiblings, ImplicitSiblings
 export ChildIndexing, IndexedChildren, NonIndexedChildren
 export NodeType, HasNodeType, NodeTypeUnknown
-export nodetype, nodevalue, nodevalues, children, parentlinks, siblinglinks, childindexing, childtype, childrentype
+export nodetype, nodevalue, nodevalues, children, childtype, childrentype
 #extended interface
 export nextsibling, prevsibling
 

src/cursors.jl

@@ -364,6 +364,7 @@ TreeCursor(::HasNodeType, ::IndexedChildren, ::ParentLinks, ::SiblingLinks, node
 TreeCursor(::HasNodeType, ::NonIndexedChildren, ::ParentLinks, ::SiblingLinks, node) = StableCursor(node)
 
 TreeCursor(::NodeTypeUnknown, ::IndexedChildren, ::ParentLinks, ::SiblingLinks, node) = IndexedCursor(node)
+TreeCursor(::NodeTypeUnknown, ::IndexedChildren, ::ImplicitParents, ::StoredSiblings, node) = IndexedCursor(node)
 
 TreeCursor(::NodeTypeUnknown, ::ChildIndexing, ::StoredParents, ::StoredSiblings, node) = TrivialCursor(node)
 

src/iteration.jl

@@ -70,7 +70,7 @@ Base.eltype(ti::TreeIterator) = eltype(typeof(ti))
 
 Base.IteratorSize(::Type{<:TreeIterator}) = SizeUnknown()
 
-function Base.iterate(ti::TreeIterator, s::Union{Nothing,IteratorState}=initial(statetype(ti), ti.root))
+function Base.iterate(ti::TreeIterator, s=initial(statetype(ti), ti.root))
     isnothing(s) && return nothing
     (nodevalue(s.cursor), next(s))
 end

test/runtests.jl

@@ -1,9 +1,11 @@
 using AbstractTrees, Test
-
+using Aqua
 
 @testset "Builtins" begin include("builtins.jl") end
 @testset "Custom tree types" begin include("trees.jl") end
 if Base.VERSION >= v"1.6"
     # Printing tests use `findall` variants that are not supported on Julia 1.0
     @testset "Printing" begin include("printing.jl") end
 end
+
+Aqua.test_all(AbstractTrees)