We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 19ecf00 commit 8efdf85Copy full SHA for 8efdf85
3 files changed
base/errorshow.jl
@@ -222,7 +222,7 @@ function showerror(io::IO, ex::MethodError)
222
arg_types = (is_arg_types ? ex.args : typesof(ex.args...))::DataType
223
f = ex.f
224
meth = methods_including_ambiguous(f, arg_types)
225
- if length(meth) > 1
+ if isa(meth, MethodList) && length(meth) > 1
226
return showerror_ambiguous(io, meth, f, arg_types)
227
end
228
arg_types_param::SimpleVector = arg_types.parameters
@@ -898,4 +898,3 @@ function show(io::IO, ::MIME"text/plain", stack::ExceptionStack)
898
show_exception_stack(io, stack)
899
900
show(io::IO, stack::ExceptionStack) = show(io, MIME("text/plain"), stack)
901
-
base/process.jl
@@ -84,15 +84,16 @@ const SpawnIOs = Vector{Any} # convenience name for readability
84
for io in stdio]
85
handle = Libc.malloc(_sizeof_uv_process)
86
disassociate_julia_struct(handle) # ensure that data field is set to C_NULL
87
+ (; exec, flags, env, dir) = cmd
88
err = ccall(:jl_spawn, Int32,
89
(Cstring, Ptr{Cstring}, Ptr{Cvoid}, Ptr{Cvoid},
90
Ptr{Tuple{Cint, UInt}}, Int,
91
UInt32, Ptr{Cstring}, Cstring, Ptr{Cvoid}),
- file, cmd.exec, loop, handle,
92
+ file, exec, loop, handle,
93
iohandles, length(iohandles),
- cmd.flags,
94
- cmd.env === nothing ? C_NULL : cmd.env,
95
- isempty(cmd.dir) ? C_NULL : cmd.dir,
+ flags,
+ env === nothing ? C_NULL : env,
96
+ isempty(dir) ? C_NULL : dir,
97
@cfunction(uv_return_spawn, Cvoid, (Ptr{Cvoid}, Int64, Int32)))
98
if err != 0
99
ccall(:jl_forceclose_uv, Cvoid, (Ptr{Cvoid},), handle) # will call free on handle eventually
base/toml_parser.jl
@@ -323,7 +323,7 @@ function Base.showerror(io::IO, err::ParserError)
323
# In this case we want the arrow to point one character
324
pos = err.pos::Int
325
err.type == ErrUnexpectedEofExpectedValue && (pos += 1)
326
- str1, err1 = point_to_line(err.str, pos, pos, io)
+ str1, err1 = point_to_line(err.str::String, pos, pos, io)
327
@static if VERSION <= v"1.6.0-DEV.121"
328
# See https://github.com/JuliaLang/julia/issues/36015
329
format_fixer = get(io, :color, false) == true ? "\e[0m" : ""
0 commit comments