Reduce Request::defaultCallback template parameter

src/uvw/request.hpp

@@ -22,8 +22,8 @@ protected:
         return ptr;
     }
 
-    template<typename R, typename E>
-    static void defaultCallback(R *req, int status) {
+    template<typename E>
+    static void defaultCallback(U *req, int status) {
         auto ptr = reserve(reinterpret_cast<uv_req_t*>(req));
         if(status) { ptr->publish(ErrorEvent{status}); }
         else { ptr->publish(E{}); }

src/uvw/stream.hpp

@@ -96,7 +96,7 @@ public:
 
     template<typename F, typename... Args>
     void connect(F &&f, Args... args) {
-        invoke(std::forward<F>(f), get(), std::forward<Args>(args)..., &defaultCallback<uv_connect_t, ConnectEvent>);
+        invoke(std::forward<F>(f), get(), std::forward<Args>(args)..., &defaultCallback<ConnectEvent>);
     }
 };
 
@@ -110,7 +110,7 @@ public:
     }
 
     void shutdown(uv_stream_t *handle) {
-        invoke(&uv_shutdown, get(), handle, &defaultCallback<uv_shutdown_t, ShutdownEvent>);
+        invoke(&uv_shutdown, get(), handle, &defaultCallback<ShutdownEvent>);
     }
 };
 
@@ -124,11 +124,11 @@ public:
     }
 
     void write(uv_stream_t *handle, const uv_buf_t bufs[], unsigned int nbufs) {
-        invoke(&uv_write, get(), handle, bufs, nbufs, &defaultCallback<uv_write_t, WriteEvent>);
+        invoke(&uv_write, get(), handle, bufs, nbufs, &defaultCallback<WriteEvent>);
     }
 
     void write(uv_stream_t *handle, const uv_buf_t bufs[], unsigned int nbufs, uv_stream_t *send) {
-        invoke(&uv_write2, get(), handle, bufs, nbufs, send, &defaultCallback<uv_write_t, WriteEvent>);
+        invoke(&uv_write2, get(), handle, bufs, nbufs, send, &defaultCallback<WriteEvent>);
     }
 };
 

src/uvw/udp.hpp

@@ -89,7 +89,7 @@ public:
     }
 
     void send(uv_udp_t *handle, const uv_buf_t bufs[], unsigned int nbufs, const struct sockaddr* addr) {
-        invoke(&uv_udp_send, get(), handle, bufs, nbufs, addr, &defaultCallback<uv_udp_send_t, SendEvent>);
+        invoke(&uv_udp_send, get(), handle, bufs, nbufs, addr, &defaultCallback<SendEvent>);
     }
 };
 

src/uvw/work.hpp

@@ -64,7 +64,7 @@ public:
      * This request can be cancelled with `cancel()`.
      */
     void queue() {
-        invoke(&uv_queue_work, parent(), get(), &workCallback, &defaultCallback<uv_work_t, WorkEvent>);
+        invoke(&uv_queue_work, parent(), get(), &workCallback, &defaultCallback<WorkEvent>);
     }
 
 private: