drop Julia 0.6 support (#53)

Author: bicycle1885

.gitignore

@@ -3,3 +3,4 @@
 *.jl.mem
 docs/build/
 docs/site/
+/Manifest.toml

.travis.yml

@@ -3,7 +3,6 @@ os:
   - linux
 #  - osx
 julia:
-  - 0.6
   - 0.7
   - nightly
 matrix:

REQUIRE

@@ -1,2 +1 @@
-julia 0.6.0
-Compat 0.62
+julia 0.7

appveyor.yml

@@ -1,14 +1,10 @@
-VERSION < v"0.7.0-beta2.199" && __precompile__()
-
 module TranscodingStreams
 
 export
     TranscodingStream,
     Noop,
     NoopStream
 
-using Compat
-
 include("memory.jl")
 include("buffer.jl")
 include("error.jl")

src/TranscodingStreams.jl

@@ -19,14 +19,8 @@ function Base.length(mem::Memory)
     return mem.size
 end
 
-if VERSION > v"0.7-"
-    function Base.lastindex(mem::Memory)
-        return Int(mem.size)
-    end
-else
-    function Base.endof(mem::Memory)
-        return Int(mem.size)
-    end
+function Base.lastindex(mem::Memory)
+    return Int(mem.size)
 end
 
 function Base.checkbounds(mem::Memory, i::Integer)

src/memory.jl

@@ -135,17 +135,9 @@ end
 # Check that mode is valid.
 macro checkmode(validmodes)
     mode = esc(:mode)
-    if VERSION ≥ v"0.7.0-beta.210"
-        quote
-            if !$(foldr((x, y) -> :($(mode) == $(QuoteNode(x)) || $(y)), eval(validmodes), init=false))
-                throw(ArgumentError(string("invalid mode :", $(mode))))
-            end
-        end
-    else
-        quote
-            if !$(foldr((x, y) -> :($(mode) == $(QuoteNode(x)) || $(y)), false, eval(validmodes)))
-                throw(ArgumentError(string("invalid mode :", $(mode))))
-            end
+    quote
+        if !$(foldr((x, y) -> :($(mode) == $(QuoteNode(x)) || $(y)), eval(validmodes), init=false))
+            throw(ArgumentError(string("invalid mode :", $(mode))))
         end
     end
 end
@@ -341,16 +333,9 @@ function Base.readbytes!(stream::TranscodingStream, b::AbstractArray{UInt8}, nb=
     return filled
 end
 
-if VERSION > v"0.7-"
-    function Base.bytesavailable(stream::TranscodingStream)
-        ready_to_read!(stream)
-        return buffersize(stream.state.buffer1)
-    end
-else
-    function Base.nb_available(stream::TranscodingStream)
-        ready_to_read!(stream)
-        return buffersize(stream.state.buffer1)
-    end
+function Base.bytesavailable(stream::TranscodingStream)
+    ready_to_read!(stream)
+    return buffersize(stream.state.buffer1)
 end
 
 function Base.readavailable(stream::TranscodingStream)

src/stream.jl

@@ -1,13 +1,8 @@
 # Test Tools
 # ==========
 
-if VERSION ≥ v"0.7.0-rc1"
-    import Test
-    import Random: seed!, randstring
-else
-    import Base.Test
-    const seed! = srand
-end
+import Test
+using Random: seed!, randstring
 
 TEST_RANDOM_SEED = 12345
 
@@ -84,11 +79,7 @@ function test_chunked_read(Encoder, Decoder)
     initialize(encoder)
     for _ in 1:500
         chunks = [rand(alpha, rand(0:100)) for _ in 1:rand(1:100)]
-        if VERSION ≥ v"0.7.0-beta.210"
-            data = mapfoldl(x->transcode(encoder, x), vcat, chunks, init=UInt8[])
-        else
-            data = mapfoldl(x->transcode(encoder, x), vcat, UInt8[], chunks)
-        end
+        data = mapfoldl(x->transcode(encoder, x), vcat, chunks, init=UInt8[])
         buffer = NoopStream(IOBuffer(data))
         ok = true
         local stream

src/testtools.jl

@@ -9,7 +9,7 @@
     source = IOBuffer("foo")
     stream = TranscodingStream(Noop(), source)
     @test !eof(stream)
-    @test read(stream) == b"foo"
+    @test read(stream) == bb"foo"
     close(stream)
 
     data = rand(UInt8, 100_000)
@@ -28,15 +28,15 @@
     @test read(stream, UInt8) === UInt8('f')
     data = Vector{UInt8}(undef, 5)
     unsafe_read(stream, pointer(data), 5) === nothing
-    @test data == b"oobar"
+    @test data == bb"oobar"
     close(stream)
 
     sink = IOBuffer()
     stream = TranscodingStream(Noop(), sink)
     @test write(stream, "foo") === 3
     @test occursin("mode=write", repr(stream))
     flush(stream)
-    @test take!(sink) == b"foo"
+    @test take!(sink) == bb"foo"
     close(stream)
 
     data = rand(UInt8, 100_000)
@@ -49,7 +49,7 @@
     @test take!(sink) == data
     close(stream)
 
-    stream = TranscodingStream(Noop(), IOBuffer(b"foobarbaz"))
+    stream = TranscodingStream(Noop(), IOBuffer(bb"foobarbaz"))
     @test position(stream) === 0
     read(stream, UInt8)
     @test position(stream) === 1
@@ -71,13 +71,13 @@
     @test !ismarked(stream)
     close(stream)
 
-    stream = TranscodingStream(Noop(), IOBuffer(b"foobarbaz"))
+    stream = TranscodingStream(Noop(), IOBuffer(bb"foobarbaz"))
     seek(stream, 2)
-    @test read(stream, 3) == b"oba"
+    @test read(stream, 3) == bb"oba"
     seek(stream, 0)
-    @test read(stream, 3) == b"foo"
+    @test read(stream, 3) == bb"foo"
     seekstart(stream)
-    @test read(stream, 3) == b"foo"
+    @test read(stream, 3) == bb"foo"
     seekend(stream)
     @test eof(stream)
     close(stream)
@@ -116,7 +116,7 @@
     out = zeros(UInt8, 3)
     @test bytesavailable(stream) == 0
     @test TranscodingStreams.unsafe_read(stream, pointer(out), 10) == 3
-    @test out == b"foo"
+    @test out == bb"foo"
     close(stream)
 
     data = rand(UInt8, 1999)
@@ -132,11 +132,11 @@
     close(stream)
 
     stream = NoopStream(NoopStream(IOBuffer("foobar")))
-    @test read(stream) == b"foobar"
+    @test read(stream) == bb"foobar"
     close(stream)
 
     stream = NoopStream(NoopStream(NoopStream(IOBuffer("foobar"))))
-    @test read(stream) == b"foobar"
+    @test read(stream) == bb"foobar"
     close(stream)
 
     # Two buffers are the same object.
@@ -151,7 +151,7 @@
     @test s1.state.buffer1 === s2.state.buffer1 === s3.state.buffer1 ===
           s1.state.buffer2 === s2.state.buffer2 === s3.state.buffer2
 
-    stream = TranscodingStream(Noop(), IOBuffer(b"foobar"))
+    stream = TranscodingStream(Noop(), IOBuffer(bb"foobar"))
     @test TranscodingStreams.stats(stream).in === Int64(0)
     @test TranscodingStreams.stats(stream).out === Int64(0)
     read(stream)
@@ -162,7 +162,7 @@
     stream = TranscodingStream(Noop(), IOBuffer())
     @test TranscodingStreams.stats(stream).in === Int64(0)
     @test TranscodingStreams.stats(stream).out === Int64(0)
-    write(stream, b"foobar")
+    write(stream, bb"foobar")
     flush(stream)
     @test TranscodingStreams.stats(stream).in === Int64(6)
     @test TranscodingStreams.stats(stream).out === Int64(6)
@@ -176,23 +176,23 @@
 
     stream = NoopStream(IOBuffer("foobar"))
     @test bytesavailable(stream) === 0
-    @test readavailable(stream) == b""
+    @test readavailable(stream) == bb""
     @test read(stream, UInt8) === UInt8('f')
     @test bytesavailable(stream) === 5
-    @test readavailable(stream) == b"oobar"
+    @test readavailable(stream) == bb"oobar"
     close(stream)
 
-    data = b""
+    data = bb""
     @test transcode(Noop, data)  == data
     @test transcode(Noop, data) !== data
-    data = b"foo"
+    data = bb"foo"
     @test transcode(Noop, data)  == data
     @test transcode(Noop, data) !== data
 
-    data = b""
+    data = bb""
     @test transcode(Noop(), data)  == data
     @test transcode(Noop(), data) !== data
-    data = b"foo"
+    data = bb"foo"
     @test transcode(Noop(), data)  == data
     @test transcode(Noop(), data) !== data
 
@@ -202,56 +202,56 @@
     TranscodingStreams.test_roundtrip_lines(NoopStream, NoopStream)
 
     # switch write => read
-    stream = NoopStream(Compat.IOBuffer(b"foobar", read=true, write=true))
+    stream = NoopStream(IOBuffer(bb"foobar", read=true, write=true))
     @test_throws ArgumentError begin
-        write(stream, b"xyz")
+        write(stream, bb"xyz")
         read(stream, 3)
     end
 
     # switch read => write
-    stream = NoopStream(Compat.IOBuffer(b"foobar", read=true, write=true))
+    stream = NoopStream(IOBuffer(bb"foobar", read=true, write=true))
     @test_throws ArgumentError begin
         read(stream, 3)
-        write(stream, b"xyz")
+        write(stream, bb"xyz")
     end
 
     stream = NoopStream(IOBuffer(""))
-    @test TranscodingStreams.unread(stream, b"foo") === nothing
-    @test read(stream, 3) == b"foo"
+    @test TranscodingStreams.unread(stream, bb"foo") === nothing
+    @test read(stream, 3) == bb"foo"
     close(stream)
 
     stream = NoopStream(IOBuffer("foo"))
-    @test read(stream, 3) == b"foo"
-    @test TranscodingStreams.unread(stream, b"bar") === nothing
-    @test read(stream, 3) == b"bar"
+    @test read(stream, 3) == bb"foo"
+    @test TranscodingStreams.unread(stream, bb"bar") === nothing
+    @test read(stream, 3) == bb"bar"
     close(stream)
 
     stream = NoopStream(IOBuffer("foobar"))
-    @test TranscodingStreams.unread(stream, b"baz") === nothing
-    @test read(stream, 3) == b"baz"
-    @test read(stream, 3) == b"foo"
-    @test read(stream, 3) == b"bar"
+    @test TranscodingStreams.unread(stream, bb"baz") === nothing
+    @test read(stream, 3) == bb"baz"
+    @test read(stream, 3) == bb"foo"
+    @test read(stream, 3) == bb"bar"
     @test eof(stream)
     close(stream)
 
     stream = NoopStream(IOBuffer("foobar"))
-    @test read(stream, 3) == b"foo"
-    @test TranscodingStreams.unread(stream, b"baz") === nothing
-    @test read(stream, 3) == b"baz"
-    @test read(stream, 3) == b"bar"
+    @test read(stream, 3) == bb"foo"
+    @test TranscodingStreams.unread(stream, bb"baz") === nothing
+    @test read(stream, 3) == bb"baz"
+    @test read(stream, 3) == bb"bar"
     @test eof(stream)
     close(stream)
 
     stream = NoopStream(IOBuffer("foobar"))
-    @test read(stream, 3) == b"foo"
-    @test read(stream, 3) == b"bar"
-    @test TranscodingStreams.unread(stream, b"baz") === nothing
-    @test read(stream, 3) == b"baz"
+    @test read(stream, 3) == bb"foo"
+    @test read(stream, 3) == bb"bar"
+    @test TranscodingStreams.unread(stream, bb"baz") === nothing
+    @test read(stream, 3) == bb"baz"
     @test eof(stream)
     close(stream)
 
     stream = NoopStream(IOBuffer("foobar"))
-    @test_throws ArgumentError TranscodingStreams.unsafe_unread(stream, pointer(b"foo"), -1)
+    @test_throws ArgumentError TranscodingStreams.unsafe_unread(stream, pointer(bb"foo"), -1)
     close(stream)
 
     stream = NoopStream(IOBuffer(""))

test/codecnoop.jl

@@ -29,12 +29,12 @@ function TranscodingStreams.minoutsize(
 end
 
 @testset "Quadruple Codec" begin
-    @test transcode(QuadrupleCodec, b"") == b""
-    @test transcode(QuadrupleCodec, b"a") == b"aaaa"
-    @test transcode(QuadrupleCodec, b"ab") == b"aaaabbbb"
-    @test transcode(QuadrupleCodec(), b"") == b""
-    @test transcode(QuadrupleCodec(), b"a") == b"aaaa"
-    @test transcode(QuadrupleCodec(), b"ab") == b"aaaabbbb"
+    @test transcode(QuadrupleCodec, bb"") == bb""
+    @test transcode(QuadrupleCodec, bb"a") == bb"aaaa"
+    @test transcode(QuadrupleCodec, bb"ab") == bb"aaaabbbb"
+    @test transcode(QuadrupleCodec(), bb"") == bb""
+    @test transcode(QuadrupleCodec(), bb"a") == bb"aaaa"
+    @test transcode(QuadrupleCodec(), bb"ab") == bb"aaaabbbb"
 
     #=
     data = "x"^1024
@@ -43,11 +43,11 @@ end
     =#
 
     stream = TranscodingStream(QuadrupleCodec(), NoopStream(IOBuffer("foo")))
-    @test read(stream) == b"ffffoooooooo"
+    @test read(stream) == bb"ffffoooooooo"
     close(stream)
 
     stream = NoopStream(TranscodingStream(QuadrupleCodec(), NoopStream(IOBuffer("foo"))))
-    @test read(stream) == b"ffffoooooooo"
+    @test read(stream) == bb"ffffoooooooo"
     close(stream)
 
     # Buffers are shared.