Update to not use start/next/done, for v1.0

Author: ScottPJones

src/compat.jl

@@ -40,6 +40,15 @@ function Base.lstrip(s::AbstractString, chars::_Chars)
     SubString(s, e+1, e)
 end
 
+@static if NEW_ITERATE
+using Iterators
+function Base.rstrip(f, s::AbstractString)
+    for (i, c) in Iterators.reverse(pairs(s))
+        f(c) || return SubString(s, 1, i)
+    end
+    SubString(s, 1, 0)
+end
+else
 function Base.rstrip(s::AbstractString, chars::_Chars)
     r = RevString(s)
     i = start(r)
@@ -50,6 +59,7 @@ function Base.rstrip(s::AbstractString, chars::_Chars)
     end
     s[1:0]
 end
+end
 
 Base.strip(s::AbstractString, chars::_Chars) = lstrip(rstrip(s, chars), chars)
 

test/basic.jl

@@ -71,10 +71,13 @@ mutable struct CharStr <: AbstractString
     chars::Vector{Char}
     CharStr(x) = new(collect(x))
 end
-start(x::CharStr) = 1
-next(x::CharStr, i::Int) = @static NEW_ITERATE ? iterate(x.chars, i) : next(x.chars, i)
-done(x::CharStr, i::Int) = i > length(x.chars)
-@static NEW_ITERATE && (iterate(x::CharStr, i::Int=1) = iterate(x.chars, i))
+@static if NEW_ITERATE
+    literate(x::CharStr, i::Int=1) = iterate(x.chars, i)
+else
+    start(x::CharStr) = 1
+    next(x::CharStr, i::Int) = next(x.chars, i)
+    done(x::CharStr, i::Int) = i > length(x.chars)
+end
 
 lastindex(x::CharStr) = lastindex(x.chars)
 ncodeunits(x::CharStr) = lastindex(x.chars)