Skip to content

Commit 33e54cd

Browse files
author
Pietro Vertechi
committed
use fieldnames instead
1 parent f50ef6c commit 33e54cd

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/interface.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ end
1212

1313
staticschema(::Type{T}) where {T<:NamedTuple} = T
1414

15-
getnames(::Type{NamedTuple{names, types}}) where {names, types} = names
16-
gettypes(::Type{NamedTuple{names, types}}) where {names, types} = types
15+
tuple_type(::Type{NamedTuple{names, types}}) where {names, types} = types
1716

1817
function fields(::Type{T}) where {T}
19-
getnames(staticschema(T))
18+
fieldnames(staticschema(T))
2019
end

src/structarray.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const StructVector{T, C<:NamedTuple} = StructArray{T, 1, C}
3333
StructVector{T}(args...; kwargs...) where {T} = StructArray{T}(args...; kwargs...)
3434
StructVector(args...; kwargs...) = StructArray(args...; kwargs...)
3535

36-
Base.IndexStyle(::Type{StructArray{T, N, C}}) where {T, N, C} = Base.IndexStyle(gettypes(C).parameters[1])
36+
Base.IndexStyle(::Type{StructArray{T, N, C}}) where {T, N, C} = Base.IndexStyle(tuple_type(C).parameters[1])
3737

3838
_undef_array(::Type{T}, sz; unwrap = t -> false) where {T} = unwrap(T) ? StructArray{T}(undef, sz; unwrap = unwrap) : Array{T}(undef, sz)
3939

src/tables.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Tables.columns(s::StructArray) = fieldarrays(s)
77

88
function Tables.schema(s::StructArray{T}) where {T}
99
NT = staticschema(T)
10-
names = getnames(NT)
11-
types = gettypes(NT).parameters
10+
names = fieldnames(NT)
11+
types = tuple_type(NT).parameters
1212
Tables.Schema(names, types)
1313
end

0 commit comments

Comments
 (0)