Convert AbstractUnitRange to OrdinalRange

JuliaLang · Jul 4, 2021 · e5221b7 · e5221b7
1 parent 09252b6
commit e5221b7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/base/multidimensional.jl b/base/multidimensional.jl
@@ -274,11 +274,6 @@ module IteratorsMD
         indices = map(r->convert(OrdinalRangeInt, r), inds)
         CartesianIndices{N, typeof(indices)}(indices)
     end
-    # specialized method in case conversion to an OrdinalRange is not defined for the indices (see issue #40035)
-    function CartesianIndices(inds::NTuple{N,AbstractUnitRange{<:Integer}}) where {N}
-        indices = map(r->convert(AbstractUnitRange{Int}, r), inds)
-        CartesianIndices{N, typeof(indices)}(indices)
-    end
 
     CartesianIndices(index::CartesianIndex) = CartesianIndices(index.I)
     CartesianIndices(inds::NTuple{N,Union{<:Integer,OrdinalRange{<:Integer}}}) where {N} =

diff --git a/base/range.jl b/base/range.jl
@@ -1187,9 +1187,7 @@ AbstractUnitRange{T}(r::UnitRange) where {T} = UnitRange{T}(r)
 AbstractUnitRange{T}(r::OneTo) where {T} = OneTo{T}(r)
 
 OrdinalRange{T1, T2}(r::StepRange) where {T1, T2<: Integer} = StepRange{T1, T2}(r)
-OrdinalRange{T1, T2}(r::AbstractUnitRange{T1}) where {T1, T2<:Integer} = r
-OrdinalRange{T1, T2}(r::UnitRange) where {T1, T2<:Integer} = UnitRange{T1}(r)
-OrdinalRange{T1, T2}(r::OneTo) where {T1, T2<:Integer} = OneTo{T1}(r)
+OrdinalRange{T, T}(r::AbstractUnitRange) where {T<:Integer} = AbstractUnitRange{T}(r)
 
 promote_rule(::Type{StepRange{T1a,T1b}}, ::Type{StepRange{T2a,T2b}}) where {T1a,T1b,T2a,T2b} =
     el_same(promote_type(T1a,T2a),