Merge pull request #19088 from JuliaLang/nl/takebuf

Simplify takebuf() API

Author: nalimilan

base/LineEdit.jl

@@ -267,7 +267,7 @@ function refresh_multi_line(terminal::UnixTerminal, args...; kwargs...)
     termbuf = TerminalBuffer(outbuf)
     ret = refresh_multi_line(termbuf, terminal, args...;kwargs...)
     # Output the entire refresh at once
-    write(terminal, takebuf_array(outbuf))
+    write(terminal, take!(outbuf))
     flush(terminal)
     return ret
 end
@@ -668,7 +668,7 @@ function normalize_key(key::AbstractString)
             write(buf, c)
         end
     end
-    return takebuf_string(buf)
+    return String(take!(buf))
 end
 
 function normalize_keys(keymap::Dict)
@@ -1501,7 +1501,7 @@ end
 activate(m::ModalInterface, s::MIState, termbuf, term::TextTerminal) =
     activate(s.current_mode, s, termbuf, term)
 
-commit_changes(t::UnixTerminal, termbuf) = write(t, takebuf_array(termbuf.out_stream))
+commit_changes(t::UnixTerminal, termbuf) = write(t, take!(termbuf.out_stream))
 function transition(f::Function, s::MIState, mode)
     if mode === :abort
         s.aborted = true

base/REPL.jl

@@ -646,7 +646,7 @@ function respond(f, repl, main; pass_empty = false)
         if !ok
             return transition(s, :abort)
         end
-        line = takebuf_string(buf)
+        line = String(take!(buf))
         if !isempty(line) || pass_empty
             reset(repl)
             val, bt = send_to_backend(f(line), backend(repl))
@@ -840,7 +840,7 @@ function setup_interface(repl::LineEditREPL; hascolor = repl.hascolor, extra_rep
                 return
             end
             edit_insert(sbuffer, input)
-            input = takebuf_string(sbuffer)
+            input = String(take!(sbuffer))
             oldpos = start(input)
             firstline = true
             isprompt_paste = false

base/REPLCompletions.jl

@@ -331,7 +331,7 @@ function complete_methods(ex_org::Expr)
         # Check if the method's type signature intersects the input types
         if typeintersect(Tuple{method.sig.parameters[1 : min(na, end)]...}, t_in) != Union{}
             show(io, method, kwtype=kwtype)
-            push!(out, takebuf_string(io))
+            push!(out, String(take!(io)))
         end
     end
     return out

base/base64.jl

@@ -176,7 +176,7 @@ function base64encode(f::Function, args...)
     b = Base64EncodePipe(s)
     f(b, args...)
     close(b)
-    takebuf_string(s)
+    String(take!(s))
 end
 base64encode(x...) = base64encode(write, x...)
 

base/c.jl

@@ -167,7 +167,7 @@ transcode{T<:Union{Int32,UInt32}}(::Type{T}, src::Vector{UInt8}) = transcode(T,
 function transcode{S<:Union{Int32,UInt32}}(::Type{UInt8}, src::Vector{S})
     buf = IOBuffer()
     for c in src; print(buf, Char(c)); end
-    takebuf_array(buf)
+    take!(buf)
 end
 transcode(::Type{String}, src::String) = src
 transcode(T, src::String) = transcode(T, src.data)

base/datafmt.jl

@@ -643,9 +643,9 @@ function writedlm(io::IO, a::AbstractMatrix, dlm; opts...)
             writedlm_cell(pb, a[i, j], dlm, quotes)
             j == lastc ? write(pb,'\n') : print(pb,dlm)
         end
-        (nb_available(pb) > (16*1024)) && write(io, takebuf_array(pb))
+        (nb_available(pb) > (16*1024)) && write(io, take!(pb))
     end
-    write(io, takebuf_array(pb))
+    write(io, take!(pb))
     nothing
 end
 
@@ -677,9 +677,9 @@ function writedlm(io::IO, itr, dlm; opts...)
     pb = PipeBuffer()
     for row in itr
         writedlm_row(pb, row, dlm, quotes)
-        (nb_available(pb) > (16*1024)) && write(io, takebuf_array(pb))
+        (nb_available(pb) > (16*1024)) && write(io, take!(pb))
     end
-    write(io, takebuf_array(pb))
+    write(io, take!(pb))
     nothing
 end
 

base/deprecated.jl

@@ -1112,4 +1112,8 @@ end)
 
 Filesystem.stop_watching(stream::Filesystem._FDWatcher) = depwarn("stop_watching(::_FDWatcher) should not be used", :stop_watching)
 
+# #19088
+@deprecate takebuf_array take!
+@deprecate takebuf_string(b) String(take!(b))
+
 # End deprecations scheduled for 0.6

base/docs/helpdb/Base.jl

@@ -52,14 +52,6 @@ Compute the inverse sine of `x`, where the output is in radians.
 """
 asin
 
-"""
-    takebuf_array(b::IOBuffer)
-
-Obtain the contents of an `IOBuffer` as an array, without copying. Afterwards, the
-`IOBuffer` is reset to its initial state.
-"""
-takebuf_array
-
 """
     pointer(array [, index])
 

base/exports.jl

@@ -1166,8 +1166,7 @@ export
     serialize,
     skip,
     skipchars,
-    takebuf_array,
-    takebuf_string,
+    take!,
     truncate,
     unmark,
     watch_file,

base/io.jl

@@ -400,7 +400,7 @@ function readuntil(s::IO, delim::Char)
             break
         end
     end
-    return takebuf_string(out)
+    return String(take!(out))
 end
 
 function readuntil{T}(s::IO, delim::T)
@@ -445,7 +445,7 @@ function readuntil(s::IO, t::AbstractString)
             break
         end
     end
-    return takebuf_string(out)
+    return String(take!(out))
 end
 
 readline() = readline(STDIN)