Merge branch 'master' into axes_methods

Author: chriselrod

Project.toml

@@ -1,6 +1,6 @@
 name = "ArrayInterface"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "2.14.6"
+version = "2.14.7"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/ArrayInterface.jl

@@ -49,7 +49,7 @@ end
 @inline function known_length(::Type{<:SubArray{T,N,P,I}}) where {T,N,P,I}
     return _known_length(ntuple(i -> known_length(I.parameters[i]), Val(N)))
 end
-_known_length(x::Tuple{Vararg{<:Union{Int,Nothing}}}) = nothing
+_known_length(x::Tuple{Vararg{Union{Nothing,Int}}}) = nothing
 _known_length(x::Tuple{Vararg{Int}}) = prod(x)
 
 

src/indexing.jl

@@ -29,7 +29,7 @@ argdims(::ArrayStyle, ::Type{T}) where {N,T<:CartesianIndex{N}} = N
 argdims(::ArrayStyle, ::Type{T}) where {N,T<:AbstractArray{CartesianIndex{N}}} = N
 argdims(::ArrayStyle, ::Type{T}) where {N,T<:AbstractArray{<:Any,N}} = N
 argdims(::ArrayStyle, ::Type{T}) where {N,T<:LogicalIndex{<:Any,<:AbstractArray{Bool,N}}} = N
-@generated function argdims(s::ArrayStyle, ::Type{T}) where {N,T<:Tuple{Vararg{<:Any,N}}}
+@generated function argdims(s::ArrayStyle, ::Type{T}) where {N,T<:Tuple{Vararg{Any,N}}}
     e = Expr(:tuple)
     for p in T.parameters
         push!(e.args, :(ArrayInterface.argdims(s, $p)))
@@ -62,7 +62,7 @@ UnsafeIndex(::ArrayStyle, ::Type{I}) where {I<:AbstractArray} = UnsafeGetCollect
 
 Base.promote_rule(::Type{X}, ::Type{Y}) where {X<:UnsafeIndex,Y<:UnsafeGetElement} = X
 
-@generated function UnsafeIndex(s::ArrayStyle, ::Type{T}) where {N,T<:Tuple{Vararg{<:Any,N}}}
+@generated function UnsafeIndex(s::ArrayStyle, ::Type{T}) where {N,T<:Tuple{Vararg{Any,N}}}
     if N === 0
         return UnsafeGetElement()
     else

src/ranges.jl

@@ -373,6 +373,8 @@ end
 const OptionallyStaticRange = Union{<:OptionallyStaticUnitRange,<:OptionallyStaticStepRange}
 
 Base.eachindex(r::OptionallyStaticRange) = r
+@inline Base.iterate(r::OptionallyStaticRange) = (fi = Int(first(r)); (fi,fi))
+
 
 Base.to_shape(x::OptionallyStaticRange) = length(x)
 Base.to_shape(x::Slice{T}) where {T<:OptionallyStaticRange} = length(x)