Merge branch 'JuliaArrays:master' into master

Author: astrozot

Project.toml

@@ -1,6 +1,6 @@
 name = "StaticArrays"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.9.13"
+version = "1.9.14"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/abstractarray.jl

@@ -285,11 +285,11 @@ end
 # SArrays may avoid the SubArray wrapper and consequently an additional level of indirection
 # The output may use the broadcasting machinery defined for StaticArrays (see issue #892)
 # wrap elements in Scalar to be consistent with 0D views
-_maybewrapscalar(S::SArray{<:Any,T}, r::T) where {T} = Scalar{T}(r)
-_maybewrapscalar(S, r) = r
+_maybewrapscalar(::Tuple{}, r::T) where {T} = Scalar{T}(r)
+_maybewrapscalar(_, r) = r
 function Base.view(S::SArray, I::Union{Colon, Integer, SOneTo, StaticArray{<:Tuple, Int}, CartesianIndex}...)
     V = getindex(S, I...)
-    _maybewrapscalar(S, V)
+    _maybewrapscalar(Base.index_dimsum(I...), V)
 end
 
 # zeros, ones and fill may return SArrays if all the axes are statically sized

test/indexing.jl

@@ -253,4 +253,16 @@ using StaticArrays, Test
         @test lastindex(ind[3]) === 2
         @test size(ind[3]) === (2,)
     end
+
+    @testset "Array view into `Any` eltype `SArray`" begin
+        A = SVector{4, Any}(1,2,3,4)
+        v = @inferred view(A, SA[3, 1])
+        @test v == SVector{2, Any}(3, 1)
+        A = SMatrix{2, 2, Any}(1, 2, 3, 4)
+        v = @inferred view(A, @SArray(fill(1, 1, 1)))
+        @test v == SMatrix{1, 1, Any}(1)
+        A = SArray{Tuple{2, 2, 2}, Any}(1, 2, 3, 4, 5, 6, 7, 8)
+        v = @inferred view(A, @SArray(fill(1, 1, 1, 1)))
+        @test v == SArray{Tuple{1, 1, 1}, Any}(1)
+    end
 end