Skip to content

Commit 131d498

Browse files
authored
Merge pull request #618 from JuliaIO/dev
Version v0.5.9
2 parents 70f10de + 89d8a39 commit 131d498

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: julia-actions/julia-buildpkg@v1
3434
- uses: julia-actions/julia-runtest@v1
3535
- uses: julia-actions/julia-processcoverage@v1
36-
- uses: codecov/codecov-action@v4
36+
- uses: codecov/codecov-action@v5
3737
with:
3838
token: ${{ secrets.CODECOV_TOKEN }}
3939
file: lcov.info

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.9
2+
- fix regression for `Union{Bool,Nothing}` array elements (#617)
3+
- fix printing issue in `printtoc`
4+
15
## 0.5.8
26
- Stop using `Base.module_keys` as it is removed on nightly
37

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "JLD2"
22
uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
3-
version = "0.5.8"
3+
version = "0.5.9"
44

55
[deps]
66
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"

src/JLD2.jl

+3-1
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,10 @@ Prints an overview of the contents of `f` to the `IO`.
462462
Use the optional `numlines` parameter to restrict the amount of items listed.
463463
"""
464464
printtoc(f::JLDFile; kwargs...) = printtoc(Base.stdout, f; kwargs...)
465-
printtoc(io::IO, f::JLDFile; numlines = typemax(Int64)) =
465+
function printtoc(io::IO, f::JLDFile; numlines = typemax(Int64))
466466
show_group(io, f.root_group, numlines, " ", true)
467+
return nothing
468+
end
467469

468470

469471

src/inlineunion.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ end
5252
# except for the ReadRepresentation and the very last line where the data is
5353
# converted back into a Union Array
5454
function read_array(f::JLDFile, dataspace::ReadDataspace,
55-
rr::MappedRepr{InlineUnionEl{T1,T2},RR}, layout::DataLayout,
55+
rr::ReadRepresentation{InlineUnionEl{T1,T2},RR}, layout::DataLayout,
5656
filters::FilterPipeline, header_offset::RelOffset,
57-
attributes::Union{Vector{ReadAttribute},Nothing}) where {T1, T2,RR}
57+
attributes::Union{Vector{ReadAttribute},Nothing}) where {T1,T2,RR}
5858
io = f.io
5959
ndims, offset = get_ndims_offset(f, dataspace, attributes)
6060
seek(io, offset)

test/inlineunion.jl

+4
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,8 @@ struct Bparam{T}; x::T; end
4040
u = Union{Float32, Missing}[rand(5,5);]
4141
save(fn, "u", u)
4242
@test u == load(fn, "u")
43+
44+
u = Union{Bool, Nothing}[true, nothing, false]
45+
save(fn, "u", u)
46+
@test u == load(fn, "u")
4347
end

0 commit comments

Comments
 (0)