Skip to content

Commit

Permalink
no emptyline before stacktrace
Browse files Browse the repository at this point in the history
  • Loading branch information
KristofferC committed Dec 13, 2016
1 parent 7af3937 commit 6697dc2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion base/replutil.jl
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ function show_backtrace(io::IO, t::Vector)
n_frames = 0
frame_counter = 0
process_backtrace((a,b) -> n_frames += 1, t)
n_frames != 0 && print(io, "\n\nStacktrace:")
n_frames != 0 && print(io, "\nStacktrace:")
process_entry = (last_frame, n) -> begin
frame_counter += 1
n_spaces_align = ndigits(n_frames) - ndigits(frame_counter) + 1
Expand Down
4 changes: 2 additions & 2 deletions test/compile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ try
end
""")

t = redirected_stderr("ERROR: LoadError: Declaring __precompile__(false) is not allowed in files that are being precompiled.\n\nStacktrace:\n [1] __precompile__")
t = redirected_stderr("ERROR: LoadError: Declaring __precompile__(false) is not allowed in files that are being precompiled.\nStacktrace:\n [1] __precompile__")
try
Base.compilecache("Baz") # from __precompile__(false)
error("__precompile__ disabled test failed")
Expand Down Expand Up @@ -306,7 +306,7 @@ try
error("break me")
end
""")
t = redirected_stderr("ERROR: LoadError: break me\n\nStacktrace:\n [1] error")
t = redirected_stderr("ERROR: LoadError: break me\nStacktrace:\n [1] error")
try
Base.require(:FooBar)
error("\"LoadError: break me\" test failed")
Expand Down

0 comments on commit 6697dc2

Please sign in to comment.