fixes for Julia 1.0 (#103)

timholy · Aug 9, 2018 · 6195448 · 6195448
1 parent 272819e
commit 6195448
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/ProgressMeter.jl b/src/ProgressMeter.jl
@@ -380,19 +380,17 @@ struct ProgressWrapper{T}
 end
 
 Base.length(wrap::ProgressWrapper) = Base.length(wrap.obj)
-Base.start(wrap::ProgressWrapper) = (Base.start(wrap.obj), true)
 
-function Base.done(wrap::ProgressWrapper, state)
-    done = Base.done(wrap.obj, state[1])
-    done && finish!(wrap.meter)
-    return done
-end
+function Base.iterate(wrap::ProgressWrapper, state...)
+    ir = iterate(wrap.obj, state...)
+
+    if ir === nothing
+        finish!(wrap.meter)
+    elseif !isempty(state)
+        next!(wrap.meter)
+    end
 
-function Base.next(wrap::ProgressWrapper, state)
-    st, firstiteration = state
-    firstiteration || next!(wrap.meter)
-    i, st = Base.next(wrap.obj, st)
-    return (i, (st, false))
+    ir
 end
 
 """

diff --git a/test/test.jl b/test/test.jl
@@ -1,8 +1,8 @@
 import ProgressMeter
-using Random: srand
+using Random: seed!
 using Test
 
-srand(123)
+seed!(123)
 
 function testfunc(n, dt, tsleep)
     p = ProgressMeter.Progress(n, dt)