Skip to content

Commit 2c5cfe1

Browse files
author
Eric Reed
committed
removed obsolete FIXMEs. formatting changes.
1 parent f202713 commit 2c5cfe1

File tree

1 file changed

+24
-54
lines changed

1 file changed

+24
-54
lines changed

src/libstd/rt/uv/uvll.rs

Lines changed: 24 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -235,27 +235,20 @@ pub unsafe fn tcp_init(loop_handle: *c_void, handle: *uv_tcp_t) -> c_int {
235235
return rust_uv_tcp_init(loop_handle, handle);
236236
}
237237

238-
// FIXME ref #2064
239-
pub unsafe fn tcp_connect(connect_ptr: *uv_connect_t,
240-
tcp_handle_ptr: *uv_tcp_t,
241-
addr_ptr: *sockaddr_in,
242-
after_connect_cb: *u8) -> c_int {
243-
return rust_uv_tcp_connect(connect_ptr, tcp_handle_ptr,
244-
after_connect_cb, addr_ptr);
245-
}
246-
// FIXME ref #2064
247-
pub unsafe fn tcp_connect6(connect_ptr: *uv_connect_t,
248-
tcp_handle_ptr: *uv_tcp_t,
249-
addr_ptr: *sockaddr_in6,
250-
after_connect_cb: *u8) -> c_int {
251-
return rust_uv_tcp_connect6(connect_ptr, tcp_handle_ptr,
252-
after_connect_cb, addr_ptr);
253-
}
254-
// FIXME ref #2064
238+
pub unsafe fn tcp_connect(connect_ptr: *uv_connect_t, tcp_handle_ptr: *uv_tcp_t,
239+
addr_ptr: *sockaddr_in, after_connect_cb: *u8) -> c_int {
240+
return rust_uv_tcp_connect(connect_ptr, tcp_handle_ptr, after_connect_cb, addr_ptr);
241+
}
242+
243+
pub unsafe fn tcp_connect6(connect_ptr: *uv_connect_t, tcp_handle_ptr: *uv_tcp_t,
244+
addr_ptr: *sockaddr_in6, after_connect_cb: *u8) -> c_int {
245+
return rust_uv_tcp_connect6(connect_ptr, tcp_handle_ptr, after_connect_cb, addr_ptr);
246+
}
247+
255248
pub unsafe fn tcp_bind(tcp_server_ptr: *uv_tcp_t, addr_ptr: *sockaddr_in) -> c_int {
256249
return rust_uv_tcp_bind(tcp_server_ptr, addr_ptr);
257250
}
258-
// FIXME ref #2064
251+
259252
pub unsafe fn tcp_bind6(tcp_server_ptr: *uv_tcp_t, addr_ptr: *sockaddr_in6) -> c_int {
260253
return rust_uv_tcp_bind6(tcp_server_ptr, addr_ptr);
261254
}
@@ -444,16 +437,11 @@ extern {
444437
fn rust_uv_idle_stop(handle: *uv_idle_t) -> c_int;
445438

446439
fn rust_uv_async_send(handle: *uv_async_t);
447-
fn rust_uv_async_init(loop_handle: *c_void,
448-
async_handle: *uv_async_t,
449-
cb: *u8) -> c_int;
440+
fn rust_uv_async_init(loop_handle: *c_void, async_handle: *uv_async_t, cb: *u8) -> c_int;
450441
fn rust_uv_tcp_init(loop_handle: *c_void, handle_ptr: *uv_tcp_t) -> c_int;
451-
// FIXME ref #2604 .. ?
452442
fn rust_uv_buf_init(out_buf: *uv_buf_t, base: *u8, len: size_t);
453443
fn rust_uv_last_error(loop_handle: *c_void) -> uv_err_t;
454-
// FIXME ref #2064
455444
fn rust_uv_strerror(err: *uv_err_t) -> *c_char;
456-
// FIXME ref #2064
457445
fn rust_uv_err_name(err: *uv_err_t) -> *c_char;
458446
fn rust_uv_ip4_addrp(ip: *u8, port: c_int) -> *sockaddr_in;
459447
fn rust_uv_ip6_addrp(ip: *u8, port: c_int) -> *sockaddr_in6;
@@ -463,52 +451,34 @@ extern {
463451
fn rust_uv_ip6_name(src: *sockaddr_in6, dst: *u8, size: size_t) -> c_int;
464452
fn rust_uv_ip4_port(src: *sockaddr_in) -> c_uint;
465453
fn rust_uv_ip6_port(src: *sockaddr_in6) -> c_uint;
466-
// FIXME ref #2064
467-
fn rust_uv_tcp_connect(connect_ptr: *uv_connect_t,
468-
tcp_handle_ptr: *uv_tcp_t,
469-
after_cb: *u8,
454+
fn rust_uv_tcp_connect(connect_ptr: *uv_connect_t, tcp_handle_ptr: *uv_tcp_t, after_cb: *u8,
470455
addr: *sockaddr_in) -> c_int;
471-
// FIXME ref #2064
472456
fn rust_uv_tcp_bind(tcp_server: *uv_tcp_t, addr: *sockaddr_in) -> c_int;
473-
// FIXME ref #2064
474-
fn rust_uv_tcp_connect6(connect_ptr: *uv_connect_t,
475-
tcp_handle_ptr: *uv_tcp_t,
476-
after_cb: *u8,
457+
fn rust_uv_tcp_connect6(connect_ptr: *uv_connect_t, tcp_handle_ptr: *uv_tcp_t, after_cb: *u8,
477458
addr: *sockaddr_in6) -> c_int;
478-
// FIXME ref #2064
479459
fn rust_uv_tcp_bind6(tcp_server: *uv_tcp_t, addr: *sockaddr_in6) -> c_int;
480-
fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t,
481-
name: *sockaddr_in) -> c_int;
482-
fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t,
483-
name: *sockaddr_in6) ->c_int;
460+
fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t, name: *sockaddr_in) -> c_int;
461+
fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t, name: *sockaddr_in6) ->c_int;
484462

485463
fn rust_uv_udp_init(loop_handle: *uv_loop_t, handle_ptr: *uv_udp_t) -> c_int;
486464
fn rust_uv_udp_bind(server: *uv_udp_t, addr: *sockaddr_in, flags: c_uint) -> c_int;
487465
fn rust_uv_udp_bind6(server: *uv_udp_t, addr: *sockaddr_in6, flags: c_uint) -> c_int;
488-
fn rust_uv_udp_send(req: *uv_udp_send_t, handle: *uv_udp_t, buf_in: *uv_buf_t,
489-
buf_cnt: c_int, addr: *sockaddr_in, cb: *u8) -> c_int;
490-
fn rust_uv_udp_send6(req: *uv_udp_send_t, handle: *uv_udp_t, buf_in: *uv_buf_t,
491-
buf_cnt: c_int, addr: *sockaddr_in6, cb: *u8) -> c_int;
466+
fn rust_uv_udp_send(req: *uv_udp_send_t, handle: *uv_udp_t, buf_in: *uv_buf_t, buf_cnt: c_int,
467+
addr: *sockaddr_in, cb: *u8) -> c_int;
468+
fn rust_uv_udp_send6(req: *uv_udp_send_t, handle: *uv_udp_t, buf_in: *uv_buf_t, buf_cnt: c_int,
469+
addr: *sockaddr_in6, cb: *u8) -> c_int;
492470
fn rust_uv_udp_recv_start(server: *uv_udp_t, on_alloc: *u8, on_recv: *u8) -> c_int;
493471
fn rust_uv_udp_recv_stop(server: *uv_udp_t) -> c_int;
494472
fn rust_uv_get_udp_handle_from_send_req(req: *uv_udp_send_t) -> *uv_udp_t;
495473

496474
fn rust_uv_listen(stream: *c_void, backlog: c_int, cb: *u8) -> c_int;
497475
fn rust_uv_accept(server: *c_void, client: *c_void) -> c_int;
498-
fn rust_uv_write(req: *c_void,
499-
stream: *c_void,
500-
buf_in: *uv_buf_t,
501-
buf_cnt: c_int,
476+
fn rust_uv_write(req: *c_void, stream: *c_void, buf_in: *uv_buf_t, buf_cnt: c_int,
502477
cb: *u8) -> c_int;
503-
fn rust_uv_read_start(stream: *c_void,
504-
on_alloc: *u8,
505-
on_read: *u8) -> c_int;
478+
fn rust_uv_read_start(stream: *c_void, on_alloc: *u8, on_read: *u8) -> c_int;
506479
fn rust_uv_read_stop(stream: *c_void) -> c_int;
507-
fn rust_uv_timer_init(loop_handle: *c_void,
508-
timer_handle: *uv_timer_t) -> c_int;
509-
fn rust_uv_timer_start(timer_handle: *uv_timer_t,
510-
cb: *u8,
511-
timeout: libc::uint64_t,
480+
fn rust_uv_timer_init(loop_handle: *c_void, timer_handle: *uv_timer_t) -> c_int;
481+
fn rust_uv_timer_start(timer_handle: *uv_timer_t, cb: *u8, timeout: libc::uint64_t,
512482
repeat: libc::uint64_t) -> c_int;
513483
fn rust_uv_timer_stop(handle: *uv_timer_t) -> c_int;
514484

0 commit comments

Comments
 (0)