Merge pull request #14 from tkoolen/fix-broadcast-ambiguity

Fix broadcast ambiguity issue.

Author: tkoolen

src/TypeSortedCollections.jl

@@ -198,6 +198,7 @@ end
 Base.Broadcast._containertype(::Type{<:TypeSortedCollection}) = TypeSortedCollection
 Base.Broadcast.promote_containertype(::Type{TypeSortedCollection}, _) = TypeSortedCollection
 Base.Broadcast.promote_containertype(_, ::Type{TypeSortedCollection}) = TypeSortedCollection
+Base.Broadcast.promote_containertype(::Type{TypeSortedCollection}, ::Type{TypeSortedCollection}) = TypeSortedCollection
 Base.Broadcast.promote_containertype(::Type{TypeSortedCollection}, ::Type{Array}) = TypeSortedCollection # handle ambiguities with `Array`
 Base.Broadcast.promote_containertype(::Type{Array}, ::Type{TypeSortedCollection}) = TypeSortedCollection # handle ambiguities with `Array`
 

test/runtests.jl

@@ -150,7 +150,21 @@ end
     @test all(x .== results)
 end
 
-@testset "broadcast!" begin
+@testset "broadcast! consecutive TypeSortedCollections" begin
+    # strangely, having this test set appear later in the code results in different behavior
+    # see https://github.com/JuliaLang/julia/pull/23800
+    x = Number[3.; 4; 5]
+    sortedx = TypeSortedCollection(x)
+    y = [7.; 8.; 9.]
+    sortedy = TypeSortedCollection(y, indices(sortedx))
+    z = 3
+    results = similar(y, Float64)
+    broadcast!(M.g, results, sortedx, sortedy, z)
+    @test all(results .== M.g.(x, y, z))
+    @test (@allocated broadcast!(M.g, results, sortedx, sortedy, z)) == 0
+end
+
+@testset "broadcast! TSC Vec Number" begin
     x = Number[3.; 4; 5]
     sortedx = TypeSortedCollection(x)
     y1 = rand(length(x))