print Task backtrace in writemime, not show. also use showerror.

JuliaLang · Sep 15, 2015 · b8d71b7 · b8d71b7
1 parent 6601d77
commit b8d71b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/base/replutil.jl b/base/replutil.jl
@@ -38,6 +38,14 @@ writemime(io::IO, ::MIME"text/plain", t::Associative) =
 writemime(io::IO, ::MIME"text/plain", t::Union{KeyIterator, ValueIterator}) =
     showkv(io, t, limit=true)
 
+function writemime(io::IO, ::MIME"text/plain", t::Task)
+    show(io, t)
+    if t.state == :failed
+        println(io)
+        showerror(io, CapturedException(t.result, t.backtrace))
+    end
+end
+
 
 # showing exception objects as descriptive error messages
 

diff --git a/base/task.jl b/base/task.jl
@@ -7,10 +7,6 @@ Task(f) = Task(()->f())
 
 function show(io::IO, t::Task)
     print(io, "Task ($(t.state)) @0x$(hex(convert(UInt, pointer_from_objref(t)), WORD_SIZE>>2))")
-    if t.state == :failed
-        println(io)
-        show(io, CapturedException(t.result, t.backtrace))
-    end
 end
 
 # Container for a captured exception and its backtrace. Can be serialized.