From 13479342669a04a0b58db6c2809f45b975be6e52 Mon Sep 17 00:00:00 2001 From: marius Date: Fri, 6 Oct 2023 13:58:08 +0300 Subject: [PATCH] fix _truncate_at_width_or_chars compat usage --- src/chains.jl | 2 +- src/sampling.jl | 2 +- src/util.jl | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/chains.jl b/src/chains.jl index 74cf4820..09cb4315 100644 --- a/src/chains.jl +++ b/src/chains.jl @@ -124,7 +124,7 @@ function Base.print_array(io::IO, c::Chain; indent=" ") _,cols = displaysize(io) for k in keys(c[end]) str = string("$(indent)$(k) => ", repr(c[k]; context=(:limit => true))) - println(io, Base._truncate_at_width_or_chars(str, cols)) + println(io, _truncate_at_width_or_chars(str, cols)) end end end diff --git a/src/sampling.jl b/src/sampling.jl index da835cdb..c8975a25 100644 --- a/src/sampling.jl +++ b/src/sampling.jl @@ -431,7 +431,7 @@ function gibbs_sample_slice_θ!(k::Symbol) @set! θ[k] = θₖ @set! logpdfθ[k] = logpdfθₖ @set! Ω.θ = θ - pbar_dict[string(k)] = string_trunc(θₖ) + pbar_dict[string(k)] = _truncate_at_width_or_chars(θₖ) @pack! state = θ, logpdfθ, Ω end end diff --git a/src/util.jl b/src/util.jl index 9f97c5f0..176522d2 100644 --- a/src/util.jl +++ b/src/util.jl @@ -366,8 +366,7 @@ macro ⌛(args...) esc(combinedef(sdef)) else if isnothing(label) - ignore_ANSI = @static VERSION >= v"1.9.0-0" ? true : () - label = "$(Base._truncate_at_width_or_chars(ignore_ANSI..., string(prewalk(rmlines,ex)),26)) ($source_str)" + label = "$(_truncate_at_width_or_chars(string(prewalk(rmlines,ex)),26)) ($source_str)" end :(@timeit $label $(esc(ex))) end @@ -402,7 +401,10 @@ select_known_rule(rule, x, y, R₁::Unknown, R₂::Unknown) = unknown_rule_err -string_trunc(x) = Base._truncate_at_width_or_chars(string(x), displaysize(stdout)[2]-14) +function _truncate_at_width_or_chars(x, width=displaysize(stdout)[2]-14) + ignore_ANSI = @static VERSION >= v"1.9.0-0" ? true : () + Base._truncate_at_width_or_chars(ignore_ANSI..., string(x), width) +end import NamedTupleTools NamedTupleTools.select(d::Dict, keys) = (;(k=>d[k] for k in keys)...)