Use Compat.@constprop and Compat.@inline()

JuliaArrays · Sep 11, 2021 · df30950 · df30950
1 parent 84a3bce
commit df30950
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/Project.toml b/Project.toml
@@ -3,13 +3,15 @@ uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 version = "3.1.32"
 
 [deps]
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 
 [compat]
+Compat = "3.37"
 IfElse = "0.1"
 Requires = "0.5, 1.0"
 Static = "0.3.3"

diff --git a/src/ArrayInterface.jl b/src/ArrayInterface.jl
@@ -8,20 +8,11 @@ using Static
 using Static: Zero, One, nstatic, _get_tuple, eq, ne, gt, ge, lt, le, eachop, eachop_tuple,
     find_first_eq, permute, invariant_permutation
 using Base.Cartesian
+import Compat
 
 using Base: @propagate_inbounds, tail, OneTo, LogicalIndex, Slice, ReinterpretArray,
     ReshapedArray, AbstractCartesianIndex
 
-
-## utilites for internal use only ##
-@static if isdefined(Base, Symbol("@constprop"))
-    using Base: @constprop
-else
-    macro constprop(_, ex)
-        ex
-    end
-end
-
 const CanonicalInt = Union{Int,StaticInt}
 
 @static if VERSION ≥ v"1.6.0-DEV.1581"

diff --git a/src/dimensions.jl b/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)
-@constprop :aggressive function from_parent_dims(::Type{T}, dim::Int)::Int where {T}
+Compat.@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)
-@constprop :aggressive function to_parent_dims(::Type{T}, dim::Int)::Int where {T}
+Compat.@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
-@constprop :aggressive function to_dims(::Type{T}, dim::Symbol) where {T}
+Compat.@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
-@constprop :aggressive function order_named_inds(
+Compat.@constprop :aggressive function order_named_inds(
     x::Tuple{Vararg{Any,N}},
     nd::Tuple,
     inds::Tuple

diff --git a/src/indexing.jl b/src/indexing.jl
@@ -379,7 +379,7 @@ end
 
 function _generate_unsafe_get_index!_body(N::Int)
     quote
-        Base.@_inline_meta
+        Compat.@inline()
         D = eachindex(dest)
         Dy = iterate(D)
         @inbounds Base.Cartesian.@nloops $N j d -> I[d] begin