Skip to content

Commit d8087ca

Browse files
committed
extra: silence some test warnings.
1 parent 32d6559 commit d8087ca

File tree

7 files changed

+22
-43
lines changed

7 files changed

+22
-43
lines changed

src/libextra/arc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ mod tests {
517517

518518
use arc::*;
519519

520-
use core::vec;
521520
use core::cell::Cell;
522521
use core::comm;
523522
use core::task;

src/libextra/c_vec.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ mod tests {
159159

160160
assert!(mem as int != 0);
161161

162-
return c_vec_with_dtor(mem as *mut u8, n as uint,
163-
|| unsafe { free(mem) });
162+
c_vec_with_dtor(mem as *mut u8, n as uint, || free(mem))
164163
}
165164
}
166165

src/libextra/dlist.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,6 @@ mod tests {
526526

527527
use super::*;
528528

529-
use core::vec;
530-
531529
#[test]
532530
fn test_dlist_concat() {
533531
let a = from_vec([1,2]);

src/libextra/net_tcp.rs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,33 +1457,23 @@ mod test {
14571457

14581458
#[test]
14591459
fn test_gl_tcp_server_and_client_ipv4() {
1460-
unsafe {
1461-
impl_gl_tcp_ipv4_server_and_client();
1462-
}
1460+
impl_gl_tcp_ipv4_server_and_client();
14631461
}
14641462
#[test]
14651463
fn test_gl_tcp_get_peer_addr() {
1466-
unsafe {
1467-
impl_gl_tcp_ipv4_get_peer_addr();
1468-
}
1464+
impl_gl_tcp_ipv4_get_peer_addr();
14691465
}
14701466
#[test]
14711467
fn test_gl_tcp_ipv4_client_error_connection_refused() {
1472-
unsafe {
1473-
impl_gl_tcp_ipv4_client_error_connection_refused();
1474-
}
1468+
impl_gl_tcp_ipv4_client_error_connection_refused();
14751469
}
14761470
#[test]
14771471
fn test_gl_tcp_server_address_in_use() {
1478-
unsafe {
1479-
impl_gl_tcp_ipv4_server_address_in_use();
1480-
}
1472+
impl_gl_tcp_ipv4_server_address_in_use();
14811473
}
14821474
#[test]
14831475
fn test_gl_tcp_server_access_denied() {
1484-
unsafe {
1485-
impl_gl_tcp_ipv4_server_access_denied();
1486-
}
1476+
impl_gl_tcp_ipv4_server_access_denied();
14871477
}
14881478
// Strange failure on Windows. --pcwalton
14891479
#[test]

src/libextra/sync.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,6 @@ mod tests {
808808
use core::comm;
809809
use core::result;
810810
use core::task;
811-
use core::vec;
812811

813812
/************************************************************************
814813
* Semaphore tests

src/libextra/uv_global_loop.rs

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ mod test {
150150
let hl_loop = &get_gl();
151151
do iotask::interact(hl_loop) |_loop_ptr| {
152152
debug!(~"closing timer");
153-
unsafe {
154-
ll::close(timer_ptr, simple_timer_close_cb);
155-
}
153+
ll::close(timer_ptr, simple_timer_close_cb);
156154
debug!(~"about to deref exit_ch_ptr");
157155
debug!(~"after msg sent on deref'd exit_ch");
158156
};
@@ -169,24 +167,22 @@ mod test {
169167
let timer_handle = ll::timer_t();
170168
let timer_ptr: *ll::uv_timer_t = &timer_handle;
171169
do iotask::interact(iotask) |loop_ptr| {
172-
unsafe {
173-
debug!(~"user code inside interact loop!!!");
174-
let init_status = ll::timer_init(loop_ptr, timer_ptr);
175-
if(init_status == 0i32) {
176-
ll::set_data_for_uv_handle(
177-
timer_ptr as *libc::c_void,
178-
exit_ch_ptr);
179-
let start_status = ll::timer_start(timer_ptr,
180-
simple_timer_cb,
181-
1u, 0u);
182-
if(start_status != 0i32) {
183-
fail!("failure on ll::timer_start()");
184-
}
185-
}
186-
else {
187-
fail!("failure on ll::timer_init()");
170+
debug!(~"user code inside interact loop!!!");
171+
let init_status = ll::timer_init(loop_ptr, timer_ptr);
172+
if(init_status == 0i32) {
173+
ll::set_data_for_uv_handle(
174+
timer_ptr as *libc::c_void,
175+
exit_ch_ptr);
176+
let start_status = ll::timer_start(timer_ptr,
177+
simple_timer_cb,
178+
1u, 0u);
179+
if(start_status != 0i32) {
180+
fail!("failure on ll::timer_start()");
188181
}
189182
}
183+
else {
184+
fail!("failure on ll::timer_init()");
185+
}
190186
};
191187
exit_po.recv();
192188
debug!(

src/libextra/uv_ll.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1767,9 +1767,7 @@ mod test {
17671767
mod impl64 {
17681768
#[test]
17691769
fn test_uv_ll_tcp_server_and_request() {
1770-
unsafe {
1771-
super::super::impl_uv_tcp_server_and_request();
1772-
}
1770+
super::super::impl_uv_tcp_server_and_request();
17731771
}
17741772
}
17751773
#[cfg(target_arch="x86")]

0 commit comments

Comments
 (0)