Skip to content

Commit eaed26b

Browse files
authored
Merge pull request #622 from tkf/unpirate
Remove overloading of 0 arg zip()
2 parents 0579fcd + 1725ca0 commit eaed26b

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "DataStructures"
22
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
3-
version = "0.17.15"
3+
version = "0.17.16"
44

55
[deps]
66
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

src/sparse_int_set.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ struct ZippedSparseIntSetIterator{VT,IT}
210210
end
211211
end
212212

213-
Base.zip(s::SparseIntSet...;kwargs...) = ZippedSparseIntSetIterator(s...;kwargs...)
213+
function Base.zip(s0::SparseIntSet, s::SparseIntSet...; kwargs...)
214+
return ZippedSparseIntSetIterator(s0, s...; kwargs...)
215+
end
214216

215217
length(it::ZippedSparseIntSetIterator) = length(it.shortest_set)
216218

test/test_sparse_int_set.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,8 @@ import DataStructures: SparseIntSet
185185
end
186186
@test s1 == 4*24
187187
end
188+
if VERSION >= v"1.1"
189+
@test zip() isa Iterators.Zip # issue 621
190+
end
188191

189192
end

0 commit comments

Comments
 (0)