Skip to content

Commit a4349dd

Browse files
olsonjefferybrson
authored andcommitted
---
yaml --- r: 15570 b: refs/heads/try c: e6f6a8c h: refs/heads/master v: v3
1 parent 7597dde commit a4349dd

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 12f2f4c15c467991d5675bbc4be7f7c2012ee5d3
5+
refs/heads/try: e6f6a8ced4797b02a86c5143334f18a582db8d2e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/uv_ll.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,9 @@ unsafe fn timer_t() -> uv_timer_t {
732732
}
733733

734734
// data access helpers
735-
unsafe fn get_loop_for_uv_handle(handle: *libc::c_void)
735+
unsafe fn get_loop_for_uv_handle<T>(handle: *T)
736736
-> *libc::c_void {
737-
ret rustrt::rust_uv_get_loop_for_uv_handle(handle);
737+
ret rustrt::rust_uv_get_loop_for_uv_handle(handle as *libc::c_void);
738738
}
739739
unsafe fn get_stream_handle_from_connect_req(connect: *uv_connect_t)
740740
-> *uv_stream_t {
@@ -753,12 +753,13 @@ unsafe fn get_data_for_uv_loop(loop_ptr: *libc::c_void) -> *libc::c_void {
753753
unsafe fn set_data_for_uv_loop(loop_ptr: *libc::c_void, data: *libc::c_void) {
754754
rustrt::rust_uv_set_data_for_uv_loop(loop_ptr, data);
755755
}
756-
unsafe fn get_data_for_uv_handle(handle: *libc::c_void) -> *libc::c_void {
757-
ret rustrt::rust_uv_get_data_for_uv_handle(handle);
756+
unsafe fn get_data_for_uv_handle<T>(handle: *T) -> *libc::c_void {
757+
ret rustrt::rust_uv_get_data_for_uv_handle(handle as *libc::c_void);
758758
}
759-
unsafe fn set_data_for_uv_handle(handle: *libc::c_void,
760-
data: *libc::c_void) {
761-
rustrt::rust_uv_set_data_for_uv_handle(handle, data);
759+
unsafe fn set_data_for_uv_handle<T, U>(handle: *T,
760+
data: *U) {
761+
rustrt::rust_uv_set_data_for_uv_handle(handle as *libc::c_void,
762+
data as *libc::c_void);
762763
}
763764
unsafe fn get_data_for_req(req: *libc::c_void) -> *libc::c_void {
764765
ret rustrt::rust_uv_get_data_for_req(req);

0 commit comments

Comments
 (0)