Merge branch 'JuliaArrays:master' into master

Author: simone-silvestri

Project.toml

@@ -1,6 +1,6 @@
 name = "OffsetArrays"
 uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
-version = "1.15.0"
+version = "1.16.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

ext/OffsetArraysAdaptExt.jl

@@ -8,4 +8,9 @@ using OffsetArrays, Adapt
 import Adapt
 Adapt.adapt_structure(to, O::OffsetArray) = OffsetArrays.parent_call(x -> Adapt.adapt(to, x), O)
 
+@static if isdefined(Adapt, :parent_type)
+    # To support Adapt 3.0 which doesn't have parent_type defined
+    Adapt.parent_type(::Type{OffsetArray{T,N,AA}}) where {T,N,AA} = AA
+end
+
 end

test/runtests.jl

@@ -2545,6 +2545,10 @@ end
     s_arr = adapt(SMatrix{3,3}, arr)
     @test parent(s_arr) isa SArray
     @test arr == adapt(Array, s_arr)
+
+    if isdefined(Adapt, :parent_type)
+        @test Adapt.parent_type(typeof(arr)) == typeof(arr.parent)
+    end
 end
 
 @testset "Pointer" begin