add a merge method for Pairs of NamedTuple to speed up keyword …

…splatting (#25936) fixes #9551
JuliaLang · Feb 8, 2018 · b85d5a1 · b85d5a1
1 parent 2017524
commit b85d5a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/base/namedtuple.jl b/base/namedtuple.jl
@@ -226,6 +226,8 @@ end
 
 merge(a::NamedTuple{()}, b::NamedTuple) = b
 
+merge(a::NamedTuple, b::Iterators.Pairs{<:Any,<:Any,<:Any,<:NamedTuple}) = merge(a, b.data)
+
 """
  merge(a::NamedTuple, iterable)
 

diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -162,6 +162,10 @@ Array{T}(::Missing, d...) where {T} = fill!(Array{T}(uninitialized, d...), missi
 
 include("abstractdict.jl")
 
+include("iterators.jl")
+using .Iterators: zip, enumerate
+using .Iterators: Flatten, product # for generators
+
 include("namedtuple.jl")
 
 # numeric operations
@@ -207,9 +211,6 @@ include("some.jl")
 
 include("dict.jl")
 include("set.jl")
-include("iterators.jl")
-using .Iterators: zip, enumerate
-using .Iterators: Flatten, product # for generators
 
 include("char.jl")
 include("strings/basic.jl")