compat for 0.7.0-DEV.4616

Author: samoconnor

src/Parsers.jl

@@ -211,7 +211,7 @@ else
 Find `\\n` in `bytes`
 """
 find_end_of_line(bytes::AbstractVector{UInt8}) =
-    (i = findfirst(equalto(UInt8('\n')), bytes)) == nothing ? 0 : i
+    (i = findfirst(isequal(UInt8('\n')), bytes)) == nothing ? 0 : i
 end
 
 """

src/RetryRequest.jl

@@ -33,7 +33,7 @@ function request(::Type{RetryLayer{Next}}, url, req, body;
         check=(s,ex)->begin
             retry = isrecoverable(ex, req, retry_non_idempotent)
             if retry
-                @debug 1 "🔄  Retry $ex: $(sprint(showcompact, req))"
+                @debug 1 "🔄  Retry $ex: $(sprintcompact(req))"
                 reset!(req.response)
             else
                 @debug 1 "🚷  No Retry: $(no_retry_reason(ex, req))"

src/StreamRequest.jl

@@ -6,7 +6,7 @@ using ..Messages
 using ..Streams
 import ..ConnectionPool
 using ..MessageRequest
-import ..@debug, ..DEBUG_LEVEL, ..printlncompact
+import ..@debug, ..DEBUG_LEVEL, ..printlncompact, ..sprintcompact
 
 """
     request(StreamLayer, ::IO, ::Request, body) -> HTTP.Response
@@ -37,7 +37,7 @@ function request(::Type{StreamLayer}, io::IO, request::Request, body;
     if verbose == 2
         println(request)
         if iofunction == nothing && request.body === body_is_a_stream
-            println("$(typeof(request)).body: $(sprint(showcompact, body))")
+            println("$(typeof(request)).body: $(sprintcompact(body))")
         end
     end
 

src/Streams.jl

@@ -251,7 +251,7 @@ end
 else
 
     find_delim(bytes, d::UInt8) =
-        (i = findfirst(equalto(d), bytes)) == nothing ? 0 : i
+        (i = findfirst(isequal(d), bytes)) == nothing ? 0 : i
 
     function Base.readuntil(http::Stream, delim::UInt8; keep::Bool=false)
         bytes = readuntil(http, bytes->find_delim(bytes, delim))

src/compat.jl

@@ -1,6 +1,6 @@
 
 v06 = v"0.6.2"
-v07 = v"0.7.0-DEV.4456"
+v07 = v"0.7.0-DEV.4616"
 
 supported() = VERSION >= v07 ||
              (VERSION >= v06 && VERSION < v"0.7.0-DEV")
@@ -26,9 +26,11 @@ __init__() = supported() || compat_warn()
 
     compat_stdout() = stdout
 
-    compat_search(s::AbstractString, c::Char) = Base.findfirst(equalto(c), s)
+    compat_search(s::AbstractString, c::Char) = Base.findfirst(isequal(c), s)
     using Sockets
 
+    sprintcompact(x) = sprint(show, x; context=:compact => true)
+
 else
 
     supported() || compat_warn()
@@ -68,6 +70,8 @@ else
             getsockname, getaddrinfo, connect, listen, DNSError
         end))
     using .Sockets
+
+    sprintcompact(x) = sprint(showcompact, x)
 end
 
 #https://github.com/JuliaWeb/MbedTLS.jl/issues/122

src/debug.jl

@@ -16,11 +16,11 @@ end
 
 macro debugshort(n::Int, s)
     DEBUG_LEVEL >= n ? :(println("DEBUG: ", taskid(), " ",
-                                 sprint(showcompact, $(esc(s))))) :
+                                 sprintcompact($(esc(s))))) :
                        :()
 end
 
-printlncompact(x) = println(sprint(showcompact, x))
+printlncompact(x) = println(sprintcompact(x))
 
 
 @noinline function precondition_error(msg, frame)

src/sniff.jl

@@ -284,8 +284,8 @@ const LITTLE_A = UInt8('a')
 const LITTLE_S = UInt8('s')
 const PERIOD = UInt8('.')
 
-@static if VERSION >= v"0.7.0-DEV.4370"
-    const REF = Vector{Ptr{UInt8}}(uninitialized, 1)
+@static if VERSION >= v"0.7.0-DEV.4616"
+    const REF = Vector{Ptr{UInt8}}(undef, 1)
 else
     const REF = Vector{Ptr{UInt8}}(1)
 end

test/loopback.jl

@@ -112,14 +112,14 @@ function Base.unsafe_write(lb::Loopback, p::Ptr{UInt8}, n::UInt)
 
     on_headers(lb) do req
 
-        println("📡  $(sprint(showcompact, req))")
-        push!(server_events, "Request: $(sprint(showcompact, req))")
+        println("📡  $(HTTP.sprintcompact(req))")
+        push!(server_events, "Request: $(HTTP.sprintcompact(req))")
 
         if req.target == "/abort"
             reset(lb)
             response = HTTP.Response(403, ["Connection" => "close",
                                           "Content-Length" => 0]; request=req)
-            push!(server_events, "Response: $(sprint(showcompact, response))")
+            push!(server_events, "Response: $(HTTP.sprintcompact(response))")
             write(lb.io, response)
         end
     end
@@ -130,18 +130,18 @@ function Base.unsafe_write(lb::Loopback, p::Ptr{UInt8}, n::UInt)
         response = HTTP.Response(200, ["Content-Length" => l],
                                       body = req.body; request=req)
         if req.target == "/echo"
-            push!(server_events, "Response: $(sprint(showcompact, response))")
+            push!(server_events, "Response: $(HTTP.sprintcompact(response))")
             write(lb.io, response)
         elseif (m = match(r"^/delay([0-9]*)$", req.target)) != nothing
             t = parse(Int, first(m.captures))
             sleep(t/10)
-            push!(server_events, "Response: $(sprint(showcompact, response))")
+            push!(server_events, "Response: $(HTTP.sprintcompact(response))")
             write(lb.io, response)
         else
             response = HTTP.Response(403,
                                      ["Connection" => "close",
                                       "Content-Length" => 0]; request=req)
-            push!(server_events, "Response: $(sprint(showcompact, response))")
+            push!(server_events, "Response: $(HTTP.sprintcompact(response))")
             write(lb.io, response)
         end
     end