Fix JuliaLang#20108 fix JuliaLang#20111: method display errors

ihnorton · Jan 19, 2017 · 9f18635 · 9f18635
1 parent 0dfdc2c
commit 9f18635
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/base/methodshow.jl b/base/methodshow.jl
@@ -87,7 +87,7 @@ end
 function show(io::IO, m::Method; kwtype::Nullable{DataType}=Nullable{DataType}())
     tv, decls, file, line = arg_decl_parts(m)
     sig = unwrap_unionall(m.sig)
-    ft = sig.parameters[1]
+    ft = unwrap_unionall(sig.parameters[1])
     d1 = decls[1]
     if sig === Tuple
         print(io, m.name)

diff --git a/base/replutil.jl b/base/replutil.jl
@@ -515,6 +515,7 @@ function show_method_candidates(io::IO, ex::MethodError, kwargs::Vector=Any[])
                     # If the methods args is longer than input then the method
                     # arguments is printed as not a match
                     for (k, sigtype) in enumerate(sig[length(t_i)+1:end])
+                        sigtype = unwrap_unionall(sigtype)
                         if Base.isvarargtype(sigtype)
                             sigstr = string(sigtype.parameters[1], "...")
                         else