-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add sizehint keyword argument to IOBuffer #25944
Changes from 4 commits
767ea34
19d9b34
f24f51d
2e3f5e8
231146d
65f45fb
4ee880b
0103483
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -512,7 +512,7 @@ isascii(s::AbstractString) = all(isascii, s) | |
## string map, filter, has ## | ||
|
||
function map(f, s::AbstractString) | ||
out = IOBuffer(StringVector(sizeof(s)), read=true, write=true) | ||
out = IOBuffer(sizehint=sizeof(s), read=true, write=true) | ||
truncate(out, 0) | ||
for c in s | ||
c′ = f(c) | ||
|
@@ -525,7 +525,7 @@ function map(f, s::AbstractString) | |
end | ||
|
||
function filter(f, s::AbstractString) | ||
out = IOBuffer(StringVector(sizeof(s)), read=true, write=true) | ||
out = IOBuffer(sizehint=sizeof(s), read=true, write=true) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We no longer have to pass There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i.e. just call |
||
truncate(out, 0) | ||
for c in s | ||
f(c) && write(out, c) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -81,7 +81,7 @@ julia> sprint(showcompact, 66.66666) | |
``` | ||
""" | ||
function sprint(f::Function, args...; context=nothing, sizehint::Integer=0) | ||
s = IOBuffer(StringVector(sizehint), read=true, write=true) | ||
s = IOBuffer(sizehint=sizehint, read=true, write=true) | ||
# specialized version of truncate(s,0) | ||
s.size = 0 | ||
s.ptr = 1 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can't the these three lines be deleted? |
||
|
@@ -100,7 +100,7 @@ tostr_sizehint(x::Float32) = 12 | |
|
||
function print_to_string(xs...; env=nothing) | ||
# specialized for performance reasons | ||
s = IOBuffer(StringVector(tostr_sizehint(xs[1])), read=true, write=true) | ||
s = IOBuffer(sizehint=tostr_sizehint(xs[1]), read=true, write=true) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't there be an |
||
# specialized version of truncate(s,0) | ||
s.size = 0 | ||
s.ptr = 1 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can't the these three lines be deleted? |
||
|
@@ -436,7 +436,7 @@ Returns: | |
function unindent(str::AbstractString, indent::Int; tabwidth=8) | ||
indent == 0 && return str | ||
# Note: this loses the type of the original string | ||
buf = IOBuffer(StringVector(sizeof(str)), read=true, write=true) | ||
buf = IOBuffer(sizehint=sizeof(str), read=true, write=true) | ||
truncate(buf,0) | ||
cutting = true | ||
col = 0 # current column (0 based) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like
sizehint
should take precedence overmaxsize
here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
e.g. consider a case where
maxsize
is 2GB (because the buffer will be sent someplace 32-bit) butsizehint
is 8. We probably don't want to allocate 2GB.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I forgot to fix that. Now fixed. Thank you.