Skip to content

Commit 5590dfc

Browse files
olsonjefferybrson
authored andcommitted
std: tweak uv::ll::write signature and make it generic/more flexible
1 parent 550b34b commit 5590dfc

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/libstd/uv_ll.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,11 +647,13 @@ unsafe fn accept(server: *libc::c_void, client: *libc::c_void)
647647
ret rustrt::rust_uv_accept(server, client);
648648
}
649649

650-
unsafe fn write(req: *libc::c_void, stream: *libc::c_void,
650+
unsafe fn write<T>(req: *uv_write_t, stream: *T,
651651
buf_in: *[uv_buf_t], cb: *u8) -> libc::c_int {
652652
let buf_ptr = vec::unsafe::to_ptr(*buf_in);
653653
let buf_cnt = vec::len(*buf_in) as i32;
654-
ret rustrt::rust_uv_write(req, stream, buf_ptr, buf_cnt, cb);
654+
ret rustrt::rust_uv_write(req as *libc::c_void,
655+
stream as *libc::c_void,
656+
buf_ptr, buf_cnt, cb);
655657
}
656658
unsafe fn read_start(stream: *uv_stream_t, on_alloc: *u8,
657659
on_read: *u8) -> libc::c_int {
@@ -907,7 +909,7 @@ mod test {
907909
let client_data = get_data_for_req(
908910
connect_req_ptr as *libc::c_void)
909911
as *request_wrapper;
910-
let write_handle = (*client_data).write_req as *libc::c_void;
912+
let write_handle = (*client_data).write_req;
911913
log(debug, #fmt("on_connect_cb: tcp: %d write_hdl: %d",
912914
stream as int, write_handle as int));
913915
let write_result = write(write_handle,
@@ -1053,7 +1055,7 @@ mod test {
10531055
let server_chan = *((*client_data).server_chan);
10541056
comm::send(server_chan, request_str);
10551057
let write_result = write(
1056-
write_req as *libc::c_void,
1058+
write_req,
10571059
client_stream_ptr as *libc::c_void,
10581060
(*client_data).server_resp_buf,
10591061
after_server_resp_write);

0 commit comments

Comments
 (0)