move method to beside other remotecall_pool

Author: IanButterworth

src/workerpool.jl

@@ -135,6 +135,18 @@ function remotecall_pool(rc_f, f, pool::AbstractWorkerPool, args...; kwargs...)
     end
 end
 
+function remotecall_pool(rc_f, f, pool::CachingPool, args...; kwargs...)
+    worker = take!(pool)
+    f_ref = get(pool.map_obj2ref, (worker, f), (f, RemoteChannel(worker)))
+    isa(f_ref, Tuple) && (pool.map_obj2ref[(worker, f)] = f_ref[2])   # Add to tracker
+
+    try
+        rc_f(exec_from_cache, worker, f_ref, args...; kwargs...)
+    finally
+        put!(pool, worker)
+    end
+end
+
 # Specialization for remotecall. We have to wait for the Future it returns
 # before putting the worker back in the pool.
 function remotecall_pool(rc_f::typeof(remotecall), f, pool::AbstractWorkerPool, args...; kwargs...)
@@ -388,15 +400,3 @@ function exec_from_cache(f_ref::Tuple{Function, RemoteChannel}, args...; kwargs.
     put!(f_ref[2], f_ref[1])        # Cache locally
     f_ref[1](args...; kwargs...)
 end
-
-function remotecall_pool(rc_f, f, pool::CachingPool, args...; kwargs...)
-    worker = take!(pool)
-    f_ref = get(pool.map_obj2ref, (worker, f), (f, RemoteChannel(worker)))
-    isa(f_ref, Tuple) && (pool.map_obj2ref[(worker, f)] = f_ref[2])   # Add to tracker
-
-    try
-        rc_f(exec_from_cache, worker, f_ref, args...; kwargs...)
-    finally
-        put!(pool, worker)
-    end
-end