Skip to content

Type-assert collected keys before sort! to avoid invalidations #501

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

Open
Beforerr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Type-assert collected keys before sort! to avoid invalidations #501

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
4 changes: 3 additions & 1 deletion src/write.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,9 @@ function json!(buf, pos, x, opts::WriteOptions, ancestor_stack::Union{Nothing, V
c = WriteClosure{typeof(opts), al, typeof(x), typeof(io)}(buf, Base.unsafe_convert(Ptr{Int}, ref), Base.unsafe_convert(Ptr{Bool}, wroteanyref), local_ind, depth + 1, opts, ancestor_stack, io, bufsize)
_sort_keys = opts.sort_keys === true || (opts.sort_keys === nothing && !al && _sort_keys_by_default(x))
if _sort_keys && !al && x isa AbstractDict
sorted_keys = sort!(collect(keys(x)), by=k -> checkkey(StructUtils.lowerkey(opts.style, k)))
# assert: `x` can be inferred as `Any`, and `sort!` kwcall on an untyped arg is
# invalidated by every package adding a `sort!` kwmethod (e.g. OrderedCollections)
sorted_keys = sort!(collect(keys(x))::Vector, by=k -> checkkey(StructUtils.lowerkey(opts.style, k)))
for k in sorted_keys
if valtype(x) === Any && opts.style isa JSONStyle
_applyvalue(opts.style, c, StructUtils.lowerkey(opts.style, k), x[k])
Expand Down
Loading