Merge 3b15cac into 82210ef

src/CIDict.jl

@@ -35,14 +35,8 @@ Base.haskey(d::CIDict, s::String) = haskey(d.dct, lcase(s))
 Base.keys(d::CIDict) = keys(d.dct)
 Base.values(d::CIDict) = values(d.dct)
 
-@static if VERSION > v"0.7-"
-    Base.iterate(d::CIDict) = Base.iterate(d.dct)
-    Base.iterate(d::CIDict, state) = Base.iterate(d.dct, state)
-else
-    Base.start(d::CIDict) = start(d.dct)
-    Base.next(d::CIDict, i::Int) = next(d.dct, i)
-    Base.done(d::CIDict, i::Int) = done(d.dct, i)
-end
+Base.iterate(d::CIDict) = Base.iterate(d.dct)
+Base.iterate(d::CIDict, state) = Base.iterate(d.dct, state)
 
 Base.length(d::CIDict) = length(d.dct)
 

src/ResultSet.jl

@@ -83,13 +83,7 @@ function Base.getindex(rs::ResultSet, ss::Symbol...)
 end
 
 # Iterators
-@static if VERSION > v"0.7-"
-    Base.iterate(rs::ResultSet, i=1) = i > size(rs,1) ? nothing : (rs[i], i+1)
-else
-    Base.start(rs::ResultSet) = 1
-    Base.done(rs::ResultSet, i::Int) = i > size(rs, 1)
-    Base.next(rs::ResultSet, i::Int) = (rs[i], i+1)
-end
+Base.iterate(rs::ResultSet, i=1) = i > size(rs,1) ? nothing : (rs[i], i+1)
 
 # Display ResultSet object
 function Base.show(io::IO, rs::ResultSet)