Wrong `IteratorSize` for `pairs(::IndexCartesian, ...)`

On Julia master:
```julia
julia> Base.IteratorSize(pairs(IndexCartesian(), zeros(2,2)))
Base.HasShape{2}()
```
On Julia 0.6 with Compat:
```julia
julia> Compat.IteratorSize(Compat.pairs(IndexCartesian(), zeros(2,2)))
Base.HasLength()
```

We implicitly test for the latter behavior, making our tests fail on 0.7. We probably want to do
```diff
diff --git a/test/runtests.jl b/test/runtests.jl
index 4201f5fe..05bbf174 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -778,9 +778,9 @@ let
     A14 = [11 13; 12 14]
     R = CartesianIndices(Compat.axes(A14))
     @test [a for (a,b) in pairs(IndexLinear(),    A14)] == [1,2,3,4]
-    @test [a for (a,b) in pairs(IndexCartesian(), A14)] == vec(collect(R))
+    @test [a for (a,b) in pairs(IndexCartesian(), A14)] == collect(R)
     @test [b for (a,b) in pairs(IndexLinear(),    A14)] == [11,12,13,14]
-    @test [b for (a,b) in pairs(IndexCartesian(), A14)] == [11,12,13,14]
+    @test [b for (a,b) in pairs(IndexCartesian(), A14)] == [11 13; 12 14]
 end
 
 # Val(x)
```
But that requires fixing the result of `pairs`, which currently relies on `IndexValue` on 0.6. Should we replace the whole implementation https://github.com/JuliaLang/Compat.jl/blob/9ae12616a525b6d331884555269f0d538b99e3b0/src/Compat.jl#L574-L614 with the current one from Base?


	pairs(collection) = Base.Generator(=>, keys(collection), values(collection))
	pairs(a::Associative) = a

	# 0.6.0-dev+2834
	@static if !isdefined(Iterators, :IndexValue)
	include_string(@__MODULE__, """
	immutable IndexValue{I,A<:AbstractArray}
	data::A
	itr::I
	end
	""")

	Base.length(v::IndexValue) = length(v.itr)
	Base.indices(v::IndexValue) = indices(v.itr)
	Base.size(v::IndexValue) = size(v.itr)
	@inline Base.start(v::IndexValue) = start(v.itr)
	Base.@propagate_inbounds function Base.next(v::IndexValue, state)
	indx, n = next(v.itr, state)
	item = v.data[indx]
	(indx => item), n
	end
	@inline Base.done(v::IndexValue, state) = done(v.itr, state)

	Base.eltype{I,A}(::Type{IndexValue{I,A}}) = Pair{eltype(I), eltype(A)}

	Base.iteratorsize{I}(::Type{IndexValue{I}}) = iteratorsize(I)
	Base.iteratoreltype{I}(::Type{IndexValue{I}}) = iteratoreltype(I)

	Base.reverse(v::IndexValue) = IndexValue(v.data, reverse(v.itr))
	else
	const IndexValue = Iterators.IndexValue
	end

	pairs(::IndexLinear, A::AbstractArray) = IndexValue(A, linearindices(A))
	pairs(::IndexCartesian, A::AbstractArray) = IndexValue(A, CartesianRange(indices(A)))

	Base.keys(a::AbstractArray) = CartesianRange(indices(a))
	Base.keys(a::AbstractVector) = linearindices(a)
	Base.keys(s::IndexStyle, A::AbstractArray, B::AbstractArray...) = eachindex(s, A, B...)

	Base.values(itr) = itr

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wrong `IteratorSize` for `pairs(::IndexCartesian, ...)` #540

martinholters
openedon May 7, 2018

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Wrong IteratorSize for pairs(::IndexCartesian, ...) #540

Description

martinholtersopenedon May 7, 2018

Metadata