bugfix in collect(A) for zero-dimensional array

Ref #24187 (cherry picked from commit c59b8b1)
JuliaLang · Nov 7, 2017 · 3559369 · 3559369
1 parent 5381602
commit 3559369
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/base/array.jl b/base/array.jl
@@ -445,7 +445,7 @@ function _collect(cont, itr, ::HasEltype, isz::SizeUnknown)
     return a
 end
 
-_collect_indices(::Tuple{}, A) = copy!(Vector{eltype(A)}(), A)
+_collect_indices(::Tuple{}, A) = copy!(Array{eltype(A)}(), A)
 _collect_indices(indsA::Tuple{Vararg{OneTo}}, A) =
     copy!(Array{eltype(A)}(length.(indsA)), A)
 function _collect_indices(indsA, A)

diff --git a/test/abstractarray.jl b/test/abstractarray.jl
@@ -841,3 +841,8 @@ end
 @testset "checkbounds_indices method ambiguities #20989" begin
     @test Base.checkbounds_indices(Bool, (1:1,), ([CartesianIndex(1)],))
 end
+
+@testset "zero-dimensional copy" begin
+    Z = Array{Int}(); Z[] = 17
+    @test Z == collect(Z) == copy(Z)
+end