Fix display of pairs(::Vector) (JuliaLang#26482)

tekverkp · Mar 16, 2018 · 30318cf · 30318cf
1 parent b16acdf
commit 30318cf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/base/multidimensional.jl b/base/multidimensional.jl
@@ -1886,8 +1886,10 @@ end
 end
 
 # Show for pairs() with Cartesian indicies. Needs to be here rather than show.jl for bootstrap order
-function Base.showarg(io::IO, r::Union{Iterators.Pairs{<:Integer, <:Any, <:Any, T} where T <: Union{AbstractVector, Tuple},
- Iterators.Pairs{<:CartesianIndex, <:Any, <:Any, T} where T <: AbstractArray}, toplevel)
+function Base.showarg(io::IO, r::Iterators.Pairs{<:Integer, <:Any, <:Any, T}, toplevel) where T <: Union{AbstractVector, Tuple}
+ print(io, "pairs(::$T)")
+end
+function Base.showarg(io::IO, r::Iterators.Pairs{<:CartesianIndex, <:Any, <:Any, T}, toplevel) where T <: AbstractArray
  print(io, "pairs(::$T)")
 end
 

diff --git a/test/iterators.jl b/test/iterators.jl
@@ -473,6 +473,13 @@ end
  @test valtype(d) == V
  @test eltype(d) == Pair{K, V}
  end
+
+ let io = IOBuffer()
+ Base.showarg(io, pairs([1,2,3]), true)
+ @test String(take!(io)) == "pairs(::Array{$Int,1})"
+ Base.showarg(io, pairs((a=1, b=2)), true)
+ @test String(take!(io)) == "pairs(::NamedTuple)"
+ end
 end
 
 @testset "reverse iterators" begin