retain IdOffsetRange-preserving ops

Author: jishnub

src/axes.jl

@@ -246,29 +246,12 @@ for R in [:IIUR, :IdOffsetRange]
 end
 
 # offset-preserve broadcasting
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(-), r::IdOffsetRange) =
-    OffsetArray(.-UnitRange(r), r.offset)
 Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(-), r::IdOffsetRange, x::Integer) =
     IdOffsetRange(r.parent .- x, r.offset)
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(-), x::Integer, r::IdOffsetRange) =
-    OffsetArray(x .- UnitRange(r), r.offset)
 Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), r::IdOffsetRange, x::Integer) =
     IdOffsetRange(r.parent .+ x, r.offset)
 Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), x::Integer, r::IdOffsetRange) =
     IdOffsetRange(x .+ r.parent, r.offset)
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), x::Number, r::IdOffsetRange) =
-    OffsetArray(x .* UnitRange(r), r.offset)
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), r::IdOffsetRange, x::Number) =
-    OffsetArray(UnitRange(r) .* x, r.offset)
-# specialize for AbstractFloat to resolve ambiguity with OrdinalRange
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), x::AbstractFloat, r::IdOffsetRange) =
-    OffsetArray(x .* UnitRange(r), r.offset)
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), r::IdOffsetRange, x::AbstractFloat) =
-    OffsetArray(UnitRange(r) .* x, r.offset)
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(\), x::Number, r::IdOffsetRange) =
-    OffsetArray(x .\ UnitRange(r), r.offset)
-Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(/), r::IdOffsetRange, x::Number) =
-    OffsetArray(UnitRange(r) ./ x, r.offset)
 Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(big), r::IdOffsetRange) =
     IdOffsetRange(big.(r.parent), r.offset)
 

test/runtests.jl

@@ -166,20 +166,10 @@ end
     rc = copyto!(similar(r), r)
     n = big(typemax(Int))
     @test @inferred(broadcast(+, r, n)) == @inferred(broadcast(+, n, r)) == rc .+ n
-    @test @inferred(broadcast(-, r)) == .-rc
+    @test @inferred(broadcast(-, r, n)) == rc .- n
     @test @inferred(broadcast(big, r)) == big.(rc)
     for n in Any[2, big(typemax(Int))]
         @test @inferred(broadcast(+, r, n)) == @inferred(broadcast(+, n, r)) == rc .+ n
-        @test @inferred(broadcast(-, r, n)) == rc .- n
-        @test @inferred(broadcast(-, n, r)) == n .- rc
-        @test @inferred(broadcast(*, r, n)) == @inferred(broadcast(*, n, r)) == rc .* n
-        if VERSION >= v"1.6.0"
-            # this test fails on v1.0 due to a bug in evaluating (3:5) / big(2)
-            @test @inferred(broadcast(/, r, n)) == @inferred(broadcast(\, n, r)) == rc ./ n
-        end
-    end
-    for n in (VERSION >= v"1.6.0" ? Any[2.0, big(2.0)] : Any[2.0])
-        @test @inferred(broadcast(*, r, n)) == @inferred(broadcast(*, n, r)) == rc .* n
     end
 
     @testset "Idempotent indexing" begin