From 90d4a31a4066e3c05e936570391a0a621aaeb85c Mon Sep 17 00:00:00 2001 From: Curtis Vogt Date: Thu, 7 Jul 2016 15:12:18 -0500 Subject: [PATCH] Doctest fixes after rebase --- doc/manual/mathematical-operations.rst | 6 +++--- doc/manual/methods.rst | 4 ++-- doc/manual/stacktraces.rst | 2 +- doc/manual/strings.rst | 8 ++++---- doc/manual/types.rst | 2 +- doc/stdlib/collections.rst | 2 +- doc/stdlib/test.rst | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/manual/mathematical-operations.rst b/doc/manual/mathematical-operations.rst index eda7ba0d29b8e..c08c8b115003d 100644 --- a/doc/manual/mathematical-operations.rst +++ b/doc/manual/mathematical-operations.rst @@ -400,7 +400,7 @@ The following examples show the different forms. julia> Int8(128) ERROR: InexactError() - in Int8(::Int64) at ./sysimg.jl:63 + in Int8(::Int64) at ./sysimg.jl:53 ... julia> Int8(127.0) @@ -408,12 +408,12 @@ The following examples show the different forms. julia> Int8(3.14) ERROR: InexactError() - in Int8(::Float64) at ./sysimg.jl:63 + in Int8(::Float64) at ./sysimg.jl:53 ... julia> Int8(128.0) ERROR: InexactError() - in Int8(::Float64) at ./sysimg.jl:63 + in Int8(::Float64) at ./sysimg.jl:53 ... julia> 127 % Int8 diff --git a/doc/manual/methods.rst b/doc/manual/methods.rst index 83632a28de065..460685c029e3e 100644 --- a/doc/manual/methods.rst +++ b/doc/manual/methods.rst @@ -241,11 +241,11 @@ Julia language. Core operations typically have dozens of methods: +(a::Float16, b::Float16) at float16.jl:136 +(x::Float32, y::Float32) at float.jl:206 +(x::Float64, y::Float64) at float.jl:207 - +(x::Bool, z::Complex{Bool}) at complex.jl:137 + +(x::Bool, z::Complex{Bool}) at complex.jl:126 +(x::Bool, y::Bool) at bool.jl:48 +(x::Bool) at bool.jl:45 +{T<:AbstractFloat}(x::Bool, y::T) at bool.jl:55 - +(x::Bool, z::Complex) at complex.jl:144 + +(x::Bool, z::Complex) at complex.jl:133 +(x::Bool, A::AbstractArray{Bool,N<:Any}) at arraymath.jl:105 +(x::Char, y::Integer) at char.jl:40 ... diff --git a/doc/manual/stacktraces.rst b/doc/manual/stacktraces.rst index 62174ee078dbc..3886cb0f8b0da 100644 --- a/doc/manual/stacktraces.rst +++ b/doc/manual/stacktraces.rst @@ -264,7 +264,7 @@ by passing them into :func:`StackTraces.lookup`: julia> frame = StackTraces.lookup(pointer) 1-element Array{StackFrame,1}: - in jl_backtrace_from_here at stackwalk.c:104 + in jl_backtrace_from_here at stackwalk.c:105 julia> println("The top frame is from $(frame[1].func)!") The top frame is from jl_backtrace_from_here! diff --git a/doc/manual/strings.rst b/doc/manual/strings.rst index a0d0ade1dbf76..4679027747c94 100644 --- a/doc/manual/strings.rst +++ b/doc/manual/strings.rst @@ -289,15 +289,15 @@ such an invalid byte index, an error is thrown: julia> s[2] ERROR: UnicodeError: invalid character index - in slow_utf8_next(::Array{UInt8,1}, ::UInt8, ::Int64) at ./strings/string.jl:68 - in next at ./strings/string.jl:93 [inlined] + in slow_utf8_next(::Array{UInt8,1}, ::UInt8, ::Int64) at ./strings/string.jl:67 + in next at ./strings/string.jl:92 [inlined] in getindex(::String, ::Int64) at ./strings/basic.jl:70 ... julia> s[3] ERROR: UnicodeError: invalid character index - in slow_utf8_next(::Array{UInt8,1}, ::UInt8, ::Int64) at ./strings/string.jl:68 - in next at ./strings/string.jl:93 [inlined] + in slow_utf8_next(::Array{UInt8,1}, ::UInt8, ::Int64) at ./strings/string.jl:67 + in next at ./strings/string.jl:92 [inlined] in getindex(::String, ::Int64) at ./strings/basic.jl:70 ... diff --git a/doc/manual/types.rst b/doc/manual/types.rst index c59781a968307..a193c1a7c3809 100644 --- a/doc/manual/types.rst +++ b/doc/manual/types.rst @@ -767,7 +767,7 @@ each field: ERROR: MethodError: Cannot `convert` an object of type Float64 to an object of type Point{Float64} This may have arisen from a call to the constructor Point{Float64}(...), since type constructors fall back to convert methods. - in Point{Float64}(::Float64) at ./sysimg.jl:63 + in Point{Float64}(::Float64) at ./sysimg.jl:53 ... julia> Point{Float64}(1.0,2.0,3.0) diff --git a/doc/stdlib/collections.rst b/doc/stdlib/collections.rst index 4be226fc9e9ef..54482d0e4136c 100644 --- a/doc/stdlib/collections.rst +++ b/doc/stdlib/collections.rst @@ -1134,7 +1134,7 @@ Dequeues julia> deleteat!([6, 5, 4, 3, 2, 1], (2, 2)) ERROR: ArgumentError: indices must be unique and sorted - in deleteat!(::Array{Int64,1}, ::Tuple{Int64,Int64}) at ./array.jl:571 + in deleteat!(::Array{Int64,1}, ::Tuple{Int64,Int64}) at ./array.jl:511 ... .. function:: splice!(collection, index, [replacement]) -> item diff --git a/doc/stdlib/test.rst b/doc/stdlib/test.rst index fde0dea154d5d..4cbc2a0f9057c 100644 --- a/doc/stdlib/test.rst +++ b/doc/stdlib/test.rst @@ -265,10 +265,10 @@ writing new tests. julia> @code_warntype f(1,2,3) ... Body: - begin # none, line 1: - unless (Base.slt_int)(1,b::Int64)::Bool goto 4 + begin + unless (Base.slt_int)(1,b::Int64)::Bool goto 3 return 1 - 4: + 3: return 1.0 end::UNION{FLOAT64,INT64}