Fix to_shape and versioning

Author: Tokazama

lib/ArrayInterfaceOffsetArrays/Project.toml

@@ -10,7 +10,7 @@ Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 [compat]
 ArrayInterface = "5, 6"
 OffsetArrays = "1.11"
-Static = "0.6"
+Static = "0.7"
 julia = "1.6"
 
 [extras]

lib/ArrayInterfaceStaticArrays/Project.toml

@@ -12,7 +12,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 [compat]
 Adapt = "3"
 ArrayInterface = "6"
-Static = "0.6"
+Static = "0.7"
 StaticArrays = "1.2.5, 1.3, 1.4"
 julia = "1.6"
 

src/axes.jl

@@ -243,7 +243,7 @@ Base.axes(x::Slice{<:LazyAxis}) = (Base.axes1(x),)
 # assuming that lazy loaded params like dynamic length from `size(::Array, dim)` are going
 # be used again later with `Slice{LazyAxis}`, we quickly load indices
 Base.axes1(x::Slice{<:LazyAxis}) = indices(parent(x.indices))
-Base.to_shape(x::LazyAxis) = length(x)
+Base.to_shape(x::LazyAxis) = Base.length(x)
 
 @propagate_inbounds function Base.getindex(x::LazyAxis, i::CanonicalInt)
     @boundscheck checkindex(Bool, x, i) || throw(BoundsError(x, i))

src/ranges.jl

@@ -294,8 +294,8 @@ function Base.iterate(::SOneTo{n}, s::Int) where {n}
     end
 end
 
-Base.to_shape(x::OptionallyStaticRange) = length(x)
-Base.to_shape(x::Slice{T}) where {T<:OptionallyStaticRange} = length(x)
+Base.to_shape(x::OptionallyStaticRange) = Base.length(x)
+Base.to_shape(x::Slice{T}) where {T<:OptionallyStaticRange} = Base.length(x)
 Base.axes(S::Slice{<:OptionallyStaticUnitRange{One}}) = (S.indices,)
 Base.axes(S::Slice{<:OptionallyStaticRange}) = (Base.IdentityUnitRange(S.indices),)
 

src/size.jl

@@ -123,7 +123,7 @@ end
 #   trailing dimensions (which must be of size 1), to `static(1)`. We want to stick to
 #   `Nothing` and `Int` types, so we do one last pass to ensure everything is dynamic
 @inline function known_size(::Type{<:Iterators.Zip{T}}) where {T}
-    dynamic(reduce_tup(_promote_shape, eachop(_unzip_size, nstatic(Val(known_length(T))), T)))
+    dynamic(reduce_tup(Static._promote_shape, eachop(_unzip_size, nstatic(Val(known_length(T))), T)))
 end
 _unzip_size(::Type{T}, n::StaticInt{N}) where {T,N} = known_size(field_type(T, n))
 _known_size(::Type{T}, dim::StaticInt) where {T} = known_length(field_type(T, dim))