Skip to content

Commit 39d7a80

Browse files
Avoid accessing .names property of NamedTuple
2 parents 065eebd + 0c77002 commit 39d7a80

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/AbstractTuples.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function typetuple_to_type end
133133

134134
typetuple_to_type(tup::TypeTuple) = Tuple{ (T for T in tup)... }
135135
typetuple_to_type(tup::NamedTypeTuple) =
136-
NamedTuple{ Tuple(typeof(tup).names), Tuple{ (T for T in tup)... }}
136+
NamedTuple{propertynames(tup), Tuple{ (T for T in tup)... }}
137137

138138
"""
139139
typetuple(::Type{<:Tuple})
@@ -161,7 +161,7 @@ end
161161

162162
function typetuple(TT::Type{<:NamedTuple})
163163

164-
return NamedTuple{Tuple(TT.names)}(TT.types)
164+
return NamedTuple{fieldnames(TT)}(TT.types)
165165
end
166166

167167
# ======================================================

src/utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ end
8484

8585
# TODO check if still correct
8686
@generated function edgevals_container_type(::Val{E_VAL}) where {E_VAL <:NamedTuple}
87-
R = NamedTuple{ Tuple(E_VAL.names), Tuple{( Adjlist{T} for T in E_VAL.types )...}}
87+
R = NamedTuple{ fieldnames(E_VAL), Tuple{( Adjlist{T} for T in E_VAL.types )...}}
8888
return :($R)
8989
end
9090

test/testutils.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,9 @@ function testset_topological_equivalent(g::SimpleDiGraph, gv::ValDiGraph)
398398
end
399399

400400

401-
allkeys_for_E_VALS(E_VALS::Type{<:Tuple}) = 1:length(E_VALS.types)
402-
allkeys_for_E_VALS(E_VALS::Type{<:NamedTuple}) = E_VALS.names
403-
(1:length(E_VALS.names))
401+
allkeys_for_E_VALS(E_VALS::Type{<:Tuple}) = 1:fieldcount(E_VALS)
402+
allkeys_for_E_VALS(E_VALS::Type{<:NamedTuple}) = fieldnames(E_VALS)
403+
(1:fieldcount(E_VALS))
404404

405405

406406
# ========================================

0 commit comments

Comments
 (0)