Merge pull request #204 from simeonschaub/sds/fix_consprop

adapt to JuliaLang/julia#42125

Author: chriselrod

Project.toml

@@ -1,6 +1,6 @@
 name = "ArrayInterface"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "3.1.32"
+version = "3.1.33"
 
 [deps]
 IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
@@ -12,7 +12,7 @@ Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 [compat]
 IfElse = "0.1"
 Requires = "0.5, 1.0"
-Static = "0.3"
+Static = "0.3.3"
 julia = "1.2"
 
 [extras]

src/ArrayInterface.jl

@@ -14,10 +14,10 @@ using Base: @propagate_inbounds, tail, OneTo, LogicalIndex, Slice, ReinterpretAr
 
 
 ## utilites for internal use only ##
-@static if VERSION >= v"1.7.0-DEV.421"
-    using Base: @aggressive_constprop
+@static if isdefined(Base, Symbol("@constprop"))
+    using Base: @constprop
 else
-    macro aggressive_constprop(ex)
+    macro constprop(_, ex)
         ex
     end
 end

src/dimensions.jl

@@ -73,7 +73,7 @@ function from_parent_dims(::Type{R}) where {T,N,S,A,R<:ReinterpretArray{T,N,S,A}
 end
 
 from_parent_dims(x, dim) = from_parent_dims(typeof(x), dim)
-@aggressive_constprop function from_parent_dims(::Type{T}, dim::Int)::Int where {T}
+@constprop :aggressive function from_parent_dims(::Type{T}, dim::Int)::Int where {T}
     if dim > ndims(T)
         return static(ndims(parent_type(T)) + dim - ndims(T))
     elseif dim > 0
@@ -127,7 +127,7 @@ function to_parent_dims(::Type{R}) where {T,N,S,A,R<:ReinterpretArray{T,N,S,A}}
 end
 
 to_parent_dims(x, dim) = to_parent_dims(typeof(x), dim)
-@aggressive_constprop function to_parent_dims(::Type{T}, dim::Int)::Int where {T}
+@constprop :aggressive function to_parent_dims(::Type{T}, dim::Int)::Int where {T}
     if dim > ndims(T)
         return static(ndims(parent_type(T)) + dim - ndims(T))
     elseif dim > 0
@@ -200,7 +200,7 @@ function to_dims(::Type{T}, dim::StaticSymbol) where {T}
     end
     return i
 end
-@aggressive_constprop function to_dims(::Type{T}, dim::Symbol) where {T}
+@constprop :aggressive function to_dims(::Type{T}, dim::Symbol) where {T}
     i = find_first_eq(dim, map(Symbol, dimnames(T)))
     if i === nothing
         throw_dim_error(T, dim)
@@ -227,7 +227,7 @@ order_named_inds(x::Tuple, ::NamedTuple{(),Tuple{}}) = ()
 function order_named_inds(x::Tuple, nd::NamedTuple{L}) where {L}
     return order_named_inds(x, static(Val(L)), Tuple(nd))
 end
-@aggressive_constprop function order_named_inds(
+@constprop :aggressive function order_named_inds(
     x::Tuple{Vararg{Any,N}},
     nd::Tuple,
     inds::Tuple