Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Qualify wrap calls to avoid conflict on julia v1.11 #128

Merged
merged 1 commit into from
Feb 8, 2024
Merged

Qualify wrap calls to avoid conflict on julia v1.11 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ArgParse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ differences as well.
"""
module ArgParse

using TextWrap
import TextWrap

if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@compiler_options"))
@eval Base.Experimental.@compiler_options compile=min optimize=0 infer=false
Expand Down
12 changes: 6 additions & 6 deletions src/parsing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ function usage_string(settings::ArgParseSettings)
usage_len = length(usage_pre) + 1

str_nonwrapped = usage_pre * excl_str * optl_str * posl_str * cmdl_str
str_wrapped = wrap(str_nonwrapped, break_long_words = false, break_on_hyphens = false,
str_wrapped = TextWrap.wrap(str_nonwrapped, break_long_words = false, break_on_hyphens = false,
subsequent_indent = min(usage_len, lc_len_limit))


Expand Down Expand Up @@ -291,13 +291,13 @@ function print_group(io::IO, lst::Vector, desc::AbstractString, lc_usable_len::I
if l1len ≤ lc_usable_len
rfill = " "^(lc_len - l1len)
ll_nonwrapped = l[1] * rfill * rmargin * l[2]
ll_wrapped = wrap(ll_nonwrapped, break_long_words = false, break_on_hyphens = false,
initial_indent = lmargin, subsequent_indent = sindent)
ll_wrapped = TextWrap.wrap(ll_nonwrapped, break_long_words = false, break_on_hyphens = false,
initial_indent = lmargin, subsequent_indent = sindent)
println_unnbsp(io, ll_wrapped)
else
println_unnbsp(io, lmargin, l[1])
l2_wrapped = wrap(l[2], break_long_words = false, break_on_hyphens = false,
initial_indent = sindent, subsequent_indent = sindent)
l2_wrapped = TextWrap.wrap(l[2], break_long_words = false, break_on_hyphens = false,
initial_indent = sindent, subsequent_indent = sindent)
println_unnbsp(io, l2_wrapped)
end
end
Expand Down Expand Up @@ -385,7 +385,7 @@ function show_message(io::IO, message::AbstractString, preformatted::Bool)
print(io, message)
else
for l in split(message, "\n\n")
message_wrapped = wrap(l, break_long_words = false, break_on_hyphens = false)
message_wrapped = TextWrap.wrap(l, break_long_words = false, break_on_hyphens = false)
println_unnbsp(io, message_wrapped)
end
end
Expand Down
Loading