Skip to content

Commit 98fa88c

Browse files
committed
Fix deprecation warnings, clean whitespace
1 parent 2d07745 commit 98fa88c

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

base/deprecated.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,6 @@ unsafe_wrap(::Type{String}, p::Cstring, len::Integer, own::Bool=false) =
15401540
# Rename LibGit2.GitAnyObject to LibGit2.GitUnknownObject (part of #19839)
15411541
eval(LibGit2, :(Base.@deprecate_binding GitAnyObject GitUnknownObject))
15421542

1543-
15441543
# Deprecate one argument method in order to make chomp=true the new default #19944
15451544
@deprecate readline(s::IO) readline(s, false)
15461545
@deprecate readline(s::IOStream) readline(s, false)

base/io.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ otherwise newline characters(s) are stripped from result.
212212
"""
213213
function readlines(filename::AbstractString, chomp::Bool=true)
214214
open(filename) do f
215-
readlines(f, chomp)
215+
readlines(f, chomp)
216216
end
217217
end
218218

test/spawn.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ let r, t, sock
188188
@test !ismarked(sock)
189189
mark(sock)
190190
@test ismarked(sock)
191-
@test readline(sock) == "Hello, world!\n"
191+
@test readline(sock, false) == "Hello, world!\n"
192192
unmark(sock)
193193
@test !ismarked(sock)
194194
@test_throws ArgumentError reset(sock)
195195
@test !unmark(sock)
196-
@test readline(sock) == "Goodbye, world...\n"
196+
@test readline(sock, true) == "Goodbye, world..."
197197
#@test eof(sock) ## doesn't work
198198
close(sock)
199199
@test wait(t)
@@ -324,8 +324,8 @@ let out = Pipe(), echo = `$exename --startup-file=no -e 'print(STDOUT, " 1\t", r
324324
@test c == read!(out, c)
325325
Base.wait_readnb(out, 1)
326326
@test nb_available(out) > 0
327-
ln1 = readline(out)
328-
ln2 = readline(out)
327+
ln1 = readline(out, false)
328+
ln2 = readline(out, false)
329329
desc = readstring(out)
330330
@test !isreadable(out)
331331
@test !iswritable(out)

0 commit comments

Comments
 (0)