---

yaml
---
r: 12966
b: refs/heads/master
c: 5590dfc
h: refs/heads/master
v: v3

Author: olsonjeffery

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 550b34b7828622d6eb23e6bfbcc026c8b57e19fa
+refs/heads/master: 5590dfc85775259a3ba313c75d88db0b7e2bd708
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/uv_ll.rs

@@ -647,11 +647,13 @@ unsafe fn accept(server: *libc::c_void, client: *libc::c_void)
     ret rustrt::rust_uv_accept(server, client);
 }
 
-unsafe fn write(req: *libc::c_void, stream: *libc::c_void,
+unsafe fn write<T>(req: *uv_write_t, stream: *T,
          buf_in: *[uv_buf_t], cb: *u8) -> libc::c_int {
     let buf_ptr = vec::unsafe::to_ptr(*buf_in);
     let buf_cnt = vec::len(*buf_in) as i32;
-    ret rustrt::rust_uv_write(req, stream, buf_ptr, buf_cnt, cb);
+    ret rustrt::rust_uv_write(req as *libc::c_void,
+                              stream as *libc::c_void,
+                              buf_ptr, buf_cnt, cb);
 }
 unsafe fn read_start(stream: *uv_stream_t, on_alloc: *u8,
                      on_read: *u8) -> libc::c_int {
@@ -907,7 +909,7 @@ mod test {
             let client_data = get_data_for_req(
                 connect_req_ptr as *libc::c_void)
                 as *request_wrapper;
-            let write_handle = (*client_data).write_req as *libc::c_void;
+            let write_handle = (*client_data).write_req;
             log(debug, #fmt("on_connect_cb: tcp: %d write_hdl: %d",
                             stream as int, write_handle as int));
             let write_result = write(write_handle,
@@ -1053,7 +1055,7 @@ mod test {
                 let server_chan = *((*client_data).server_chan);
                 comm::send(server_chan, request_str);
                 let write_result = write(
-                    write_req as *libc::c_void,
+                    write_req,
                     client_stream_ptr as *libc::c_void,
                     (*client_data).server_resp_buf,
                     after_server_resp_write);