509509@inline _boundscheck_return (r, s) = (@boundscheck checkbounds (r, s); s)
510510
511511for OR in [:IIUR , :IdOffsetRange ]
512- for R in [:StepRange , :StepRangeLen , :LinRange , :UnitRange , :(Base . OneTo) ]
512+ for R in [:StepRange , :StepRangeLen , :LinRange , :UnitRange ]
513513 @eval @inline Base. getindex (r:: $R , s:: $OR ) = _boundscheck_index_retaining_axes (r, s)
514514 end
515515
@@ -518,6 +518,10 @@ for OR in [:IIUR, :IdOffsetRange]
518518 _boundscheck_index_retaining_axes (r, s)
519519 end
520520end
521+ Base. getindex (r:: Base.OneTo , s:: IdOffsetRange ) = _boundscheck_index_retaining_axes (r, s)
522+ if VERSION < v " 1.7.0-beta2"
523+ Base. getindex (r:: Base.OneTo , s:: IIUR ) = _boundscheck_index_retaining_axes (r, s)
524+ end
521525
522526# These methods are added to avoid ambiguities with Base.
523527# The ones involving Base types should be ported to Base and version-limited here
@@ -628,9 +632,9 @@ no_offset_view(a::Array) = a
628632no_offset_view (i:: Number ) = i
629633no_offset_view (A:: AbstractArray ) = _no_offset_view (axes (A), A)
630634_no_offset_view (:: Tuple{} , A:: AbstractArray{T,0} ) where T = A
631- _no_offset_view (:: Tuple{<: Base.OneTo,Vararg{<: Base.OneTo}} , A:: AbstractArray ) = A
635+ _no_offset_view (:: Tuple{Base.OneTo, Vararg{Base.OneTo}} , A:: AbstractArray ) = A
632636# the following method is needed for ambiguity resolution
633- _no_offset_view (:: Tuple{<: Base.OneTo,Vararg{<: Base.OneTo}} , A:: AbstractUnitRange ) = A
637+ _no_offset_view (:: Tuple{Base.OneTo, Vararg{Base.OneTo}} , A:: AbstractUnitRange ) = A
634638_no_offset_view (:: Any , A:: AbstractArray ) = OffsetArray (A, Origin (1 ))
635639_no_offset_view (:: Any , A:: AbstractUnitRange ) = UnitRange (A)
636640
0 commit comments