Test CI

Author: charleskawczynski

base/show.jl

@@ -695,10 +695,7 @@ function show_can_elide(p::TypeVar, wheres::Vector, elide::Int, env::SimpleVecto
     return true
 end
 
-show_typeparams(io::IO, env::SimpleVector, orig::SimpleVector, wheres::Vector) =
-    show(io, string_typeparams(io, env, orig, wheres))
-
-function string_typeparams(io::IO, env::SimpleVector, orig::SimpleVector, wheres::Vector)
+function show_typeparams(io::IO, env::SimpleVector, orig::SimpleVector, wheres::Vector)
     n = length(env)
     elide = length(wheres)
     function egal_var(p::TypeVar, @nospecialize o)
@@ -719,31 +716,29 @@ function string_typeparams(io::IO, env::SimpleVector, orig::SimpleVector, wheres
             end
         end
     end
-
-    s_result = if n > 0
-        params_string = join(
-            map(1:n) do i
-                p = env[i]
-                suffix = i < n ? ", " : ""
-                if p isa TypeVar
-                    if p.lb === Union{} && something(findfirst(@nospecialize(w) -> w === p, wheres), 0) > elide
-                        string("<:", p.ub, suffix)
-                    elseif p.ub === Any && something(findfirst(@nospecialize(w) -> w === p, wheres), 0) > elide
-                        string(">:", p.lb, suffix)
-                    else
-                        string(p, suffix)
-                    end
+    if n > 0
+        print(io, "{")
+        for i = 1:n
+            p = env[i]
+            if p isa TypeVar
+                if p.lb === Union{} && something(findfirst(@nospecialize(w) -> w === p, wheres), 0) > elide
+                    print(io, "<:")
+                    show(io, p.ub)
+                elseif p.ub === Any && something(findfirst(@nospecialize(w) -> w === p, wheres), 0) > elide
+                    print(io, ">:")
+                    show(io, p.lb)
                 else
-                    string(p, suffix)
+                    show(io, p)
                 end
+            else
+                show(io, p)
             end
-        )
-        string("{", params_string, "}")
-    else
-        ""
+            i < n && print(io, ", ")
+        end
+        print(io, "}")
     end
     resize!(wheres, elide)
-    return s_result
+    nothing
 end
 
 function show_typealias(io::IO, name::GlobalRef, x::Type, env::SimpleVector, wheres::Vector)

test/stacktraces.jl

@@ -259,6 +259,9 @@ struct F49231{a,b,c,d,e,f,g} end
     @test contains(str, "[2] \e[0m\e[1m(::$F49231{Vector, Val{…}, Vector{…}, NTuple{…}, $Int, $Int, $Int})\e[22m\e[0m\e[1m(\e[22m\e[90ma\e[39m::\e[0m$Int, \e[90mb\e[39m::\e[0m$Int, \e[90mc\e[39m::\e[0m$Int\e[0m\e[1m)\e[22m\n\e[90m")
 end
 
+@testset "type_depth_limit performance" begin
+end
+
 @testset "Base.StackTraces docstrings" begin
     @test isempty(Docs.undocumented_names(StackTraces))
 end