Remove tuple_tools and if-else branch to fix type instability

Author: charleskawczynski

src/blockbroadcast.jl

@@ -29,16 +29,14 @@ BroadcastStyle(::PseudoBlockStyle{M}, ::BlockStyle{N}) where {M,N} = BlockStyle(
 
 
 # sortedunion can assume inputs are already sorted so this could be improved
-include("tuple_tools.jl")
 sortedunion(a,b) = sort!(union(a,b))
-sortedunion(a::Tuple, b::Tuple) = tuple_sort(tuple_union(a,b))
 sortedunion(a::Base.OneTo, b::Base.OneTo) = Base.OneTo(max(last(a),last(b)))
 sortedunion(a::AbstractUnitRange, b::AbstractUnitRange) = min(first(a),first(b)):max(last(a),last(b))
 combine_blockaxes(a, b) = _BlockedUnitRange(sortedunion(blocklasts(a), blocklasts(b)))
 
-Base.Broadcast.axistype(a::BlockedUnitRange, b::BlockedUnitRange) = length(b) == 1 ? a : combine_blockaxes(a, b)
-Base.Broadcast.axistype(a::BlockedUnitRange, b) = length(b) == 1 ? a : combine_blockaxes(a, b)
-Base.Broadcast.axistype(a, b::BlockedUnitRange) = length(b) == 1 ? a : combine_blockaxes(a, b)
+Base.Broadcast.axistype(a::BlockedUnitRange, b::BlockedUnitRange) = combine_blockaxes(a, b)
+Base.Broadcast.axistype(a::BlockedUnitRange, b) = combine_blockaxes(a, b)
+Base.Broadcast.axistype(a, b::BlockedUnitRange) = combine_blockaxes(a, b)
 
 
 similar(bc::Broadcasted{<:AbstractBlockStyle{N}}, ::Type{T}) where {T,N} =

src/tuple_tools.jl

@@ -29,4 +29,3 @@ include("test_blockproduct.jl")
 include("test_blockreduce.jl")
 include("test_blockdeque.jl")
 include("test_blockcholesky.jl")
-include("test_tuple_tools.jl")

test/runtests.jl

@@ -185,6 +185,8 @@ import BlockArrays: SubBlockIterator, BlockIndexRange, Diagonal
 
         shape1 = (BlockArrays._BlockedUnitRange((2,)),);
         shape2 = (BlockArrays._BlockedUnitRange((2,)),);
+        @inferred Base.Broadcast.axistype(shape1[1], shape2[1])
+        @inferred BlockArrays.combine_blockaxes(shape1[1], shape2[1])
         @inferred Base.Broadcast.broadcast_shape(shape1, shape2)
         @code_warntype Base.Broadcast.broadcast_shape(shape1, shape2)
     end