Skip to content

Commit 13879d8

Browse files
committed
libstd: Fix tests. rs=bustage
1 parent fd095f8 commit 13879d8

13 files changed

+69
-11
lines changed

src/libstd/arc.rs

+2
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,8 @@ impl<T: Const Owned> &RWReadMode<T> {
470470
mod tests {
471471
#[legacy_exports];
472472

473+
use arc;
474+
473475
use core::oldcomm::*;
474476
use core::option::{Some, None};
475477
use core::option;

src/libstd/bitv.rs

+1
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@ mod tests {
581581
use bitv;
582582

583583
use core::uint;
584+
use core::vec;
584585

585586
#[test]
586587
fn test_to_str() {

src/libstd/flatpipes.rs

+10
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@ mod test {
695695
use core::int;
696696
use core::io::BytesReader;
697697
use core::io;
698+
use core::result;
698699
use core::sys;
699700
use core::task;
700701

@@ -818,6 +819,7 @@ mod test {
818819
use net::ip;
819820
use cell::Cell;
820821
use net::tcp::TcpSocket;
822+
use uv;
821823

822824
// Indicate to the client task that the server is listening
823825
let (begin_connect_port, begin_connect_chan) = pipes::stream();
@@ -916,6 +918,14 @@ mod test {
916918
// Tests that the different backends behave the same when the
917919
// binary streaming protocol is broken
918920
mod broken_protocol {
921+
use flatpipes::pod;
922+
use flatpipes::util::BufReader;
923+
924+
use core::io;
925+
use core::pipes;
926+
use core::sys;
927+
use core::task;
928+
919929
type PortLoader<P: BytePort> =
920930
~fn(~[u8]) -> FlatPort<int, PodUnflattener<int>, P>;
921931

src/libstd/future.rs

+3
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ pub fn spawn<A:Owned>(blk: fn~() -> A) -> Future<A> {
145145

146146
#[allow(non_implicitly_copyable_typarams)]
147147
pub mod test {
148+
use core::pipes::oneshot;
149+
use core::task;
150+
148151
#[test]
149152
pub fn test_from_value() {
150153
let f = from_value(~"snail");

src/libstd/net_ip.rs

+7
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,13 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int,
350350

351351
#[cfg(test)]
352352
mod test {
353+
use net_ip::v4;
354+
use net_ip::v6;
355+
use uv;
356+
357+
use core::result;
358+
use core::vec;
359+
353360
#[test]
354361
fn test_ip_ipv4_parse_and_format_ip() {
355362
let localhost_str = ~"127.0.0.1";

src/libstd/net_url.rs

+5
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,11 @@ impl Url: to_bytes::IterBytes {
735735
#[cfg(test)]
736736
mod tests {
737737
#[legacy_exports];
738+
use net_url::UserInfo;
739+
740+
use core::result;
741+
use core::str;
742+
738743
#[test]
739744
fn test_split_char_first() {
740745
let (u,v) = split_char_first(~"hello, sweet world", ',');

src/libstd/rope.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1264,6 +1264,7 @@ mod tests {
12641264

12651265
use core::option;
12661266
use core::str;
1267+
use core::uint;
12671268
use core::vec;
12681269

12691270
//Utility function, used for sanity check

src/libstd/sort.rs

+13
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,9 @@ fn copy_vec<T: Copy>(dest: &[mut T], s1: uint,
714714
#[cfg(test)]
715715
mod test_qsort3 {
716716
#[legacy_exports];
717+
718+
use core::vec;
719+
717720
fn check_sort(v1: &[mut int], v2: &[mut int]) {
718721
let len = vec::len::<int>(v1);
719722
quick_sort3::<int>(v1);
@@ -754,6 +757,10 @@ mod test_qsort3 {
754757
#[cfg(test)]
755758
mod test_qsort {
756759
#[legacy_exports];
760+
761+
use core::int;
762+
use core::vec;
763+
757764
fn check_sort(v1: &[mut int], v2: &[mut int]) {
758765
let len = vec::len::<int>(v1);
759766
pure fn leual(a: &int, b: &int) -> bool { *a <= *b }
@@ -815,6 +822,8 @@ mod test_qsort {
815822
mod tests {
816823
#[legacy_exports];
817824

825+
use core::vec;
826+
818827
fn check_sort(v1: &[int], v2: &[int]) {
819828
let len = vec::len::<int>(v1);
820829
pub pure fn le(a: &int, b: &int) -> bool { *a <= *b }
@@ -878,6 +887,9 @@ mod tests {
878887

879888
#[cfg(test)]
880889
mod test_tim_sort {
890+
use core::rand;
891+
use core::vec;
892+
881893
struct CVal {
882894
val: float,
883895
}
@@ -970,6 +982,7 @@ mod test_tim_sort {
970982
mod big_tests {
971983
use core::rand;
972984
use core::task;
985+
use core::uint;
973986
use core::vec;
974987

975988
#[test]

src/libstd/sync.rs

+3
Original file line numberDiff line numberDiff line change
@@ -709,10 +709,13 @@ impl &RWlockReadMode {
709709
mod tests {
710710
#[legacy_exports];
711711

712+
use core::cast;
713+
use core::option;
712714
use core::pipes;
713715
use core::ptr;
714716
use core::result;
715717
use core::task;
718+
use core::vec;
716719

717720
/************************************************************************
718721
* Semaphore tests

src/libstd/task_pool.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/// A task pool abstraction. Useful for achieving predictable CPU
1212
/// parallelism.
1313
14+
use core::io;
1415
use core::pipes::{Chan, Port};
1516
use core::pipes;
1617
use core::task::{SchedMode, SingleThreaded};

src/libstd/uv_global_loop.rs

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ mod test {
130130
use core::libc;
131131
use core::oldcomm;
132132
use core::ptr;
133+
use core::task;
133134

134135
extern fn simple_timer_close_cb(timer_ptr: *ll::uv_timer_t) unsafe {
135136
let exit_ch_ptr = ll::get_data_for_uv_handle(

src/libstd/uv_iotask.rs

+3
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,11 @@ extern fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe {
178178
mod test {
179179
use uv::ll;
180180

181+
use core::iter;
182+
use core::libc;
181183
use core::oldcomm;
182184
use core::ptr;
185+
use core::task;
183186

184187
extern fn async_close_cb(handle: *ll::uv_async_t) unsafe {
185188
log(debug, fmt!("async_close_cb handle %?", handle));

src/libstd/uv_ll.rs

+19-11
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,13 @@ pub unsafe fn addrinfo_as_sockaddr_in6(input: *addrinfo) -> *sockaddr_in6 {
10401040

10411041
#[cfg(test)]
10421042
pub mod test {
1043+
use core::libc;
1044+
use core::oldcomm;
1045+
use core::ptr;
1046+
use core::str;
1047+
use core::sys;
1048+
use core::task;
1049+
use core::vec;
10431050

10441051
enum tcp_read_data {
10451052
tcp_read_eof,
@@ -1562,7 +1569,8 @@ pub mod test {
15621569
// struct size tests
15631570
#[test]
15641571
fn test_uv_ll_struct_size_uv_tcp_t() {
1565-
let foreign_handle_size = rustrt::rust_uv_helper_uv_tcp_t_size();
1572+
let foreign_handle_size =
1573+
::uv_ll::rustrt::rust_uv_helper_uv_tcp_t_size();
15661574
let rust_handle_size = sys::size_of::<uv_tcp_t>();
15671575
let output = fmt!("uv_tcp_t -- foreign: %u rust: %u",
15681576
foreign_handle_size as uint, rust_handle_size);
@@ -1572,7 +1580,7 @@ pub mod test {
15721580
#[test]
15731581
fn test_uv_ll_struct_size_uv_connect_t() {
15741582
let foreign_handle_size =
1575-
rustrt::rust_uv_helper_uv_connect_t_size();
1583+
::uv_ll::rustrt::rust_uv_helper_uv_connect_t_size();
15761584
let rust_handle_size = sys::size_of::<uv_connect_t>();
15771585
let output = fmt!("uv_connect_t -- foreign: %u rust: %u",
15781586
foreign_handle_size as uint, rust_handle_size);
@@ -1582,7 +1590,7 @@ pub mod test {
15821590
#[test]
15831591
fn test_uv_ll_struct_size_uv_buf_t() {
15841592
let foreign_handle_size =
1585-
rustrt::rust_uv_helper_uv_buf_t_size();
1593+
::uv_ll::rustrt::rust_uv_helper_uv_buf_t_size();
15861594
let rust_handle_size = sys::size_of::<uv_buf_t>();
15871595
let output = fmt!("uv_buf_t -- foreign: %u rust: %u",
15881596
foreign_handle_size as uint, rust_handle_size);
@@ -1592,7 +1600,7 @@ pub mod test {
15921600
#[test]
15931601
fn test_uv_ll_struct_size_uv_write_t() {
15941602
let foreign_handle_size =
1595-
rustrt::rust_uv_helper_uv_write_t_size();
1603+
::uv_ll::rustrt::rust_uv_helper_uv_write_t_size();
15961604
let rust_handle_size = sys::size_of::<uv_write_t>();
15971605
let output = fmt!("uv_write_t -- foreign: %u rust: %u",
15981606
foreign_handle_size as uint, rust_handle_size);
@@ -1603,7 +1611,7 @@ pub mod test {
16031611
#[test]
16041612
fn test_uv_ll_struct_size_sockaddr_in() {
16051613
let foreign_handle_size =
1606-
rustrt::rust_uv_helper_sockaddr_in_size();
1614+
::uv_ll::rustrt::rust_uv_helper_sockaddr_in_size();
16071615
let rust_handle_size = sys::size_of::<sockaddr_in>();
16081616
let output = fmt!("sockaddr_in -- foreign: %u rust: %u",
16091617
foreign_handle_size as uint, rust_handle_size);
@@ -1613,7 +1621,7 @@ pub mod test {
16131621
#[test]
16141622
fn test_uv_ll_struct_size_sockaddr_in6() {
16151623
let foreign_handle_size =
1616-
rustrt::rust_uv_helper_sockaddr_in6_size();
1624+
::uv_ll::rustrt::rust_uv_helper_sockaddr_in6_size();
16171625
let rust_handle_size = sys::size_of::<sockaddr_in6>();
16181626
let output = fmt!("sockaddr_in6 -- foreign: %u rust: %u",
16191627
foreign_handle_size as uint, rust_handle_size);
@@ -1628,7 +1636,7 @@ pub mod test {
16281636
#[ignore(reason = "questionable size calculations")]
16291637
fn test_uv_ll_struct_size_addr_in() {
16301638
let foreign_handle_size =
1631-
rustrt::rust_uv_helper_addr_in_size();
1639+
::uv_ll::rustrt::rust_uv_helper_addr_in_size();
16321640
let rust_handle_size = sys::size_of::<addr_in>();
16331641
let output = fmt!("addr_in -- foreign: %u rust: %u",
16341642
foreign_handle_size as uint, rust_handle_size);
@@ -1640,7 +1648,7 @@ pub mod test {
16401648
#[test]
16411649
fn test_uv_ll_struct_size_uv_async_t() {
16421650
let foreign_handle_size =
1643-
rustrt::rust_uv_helper_uv_async_t_size();
1651+
::uv_ll::rustrt::rust_uv_helper_uv_async_t_size();
16441652
let rust_handle_size = sys::size_of::<uv_async_t>();
16451653
let output = fmt!("uv_async_t -- foreign: %u rust: %u",
16461654
foreign_handle_size as uint, rust_handle_size);
@@ -1651,7 +1659,7 @@ pub mod test {
16511659
#[test]
16521660
fn test_uv_ll_struct_size_uv_timer_t() {
16531661
let foreign_handle_size =
1654-
rustrt::rust_uv_helper_uv_timer_t_size();
1662+
::uv_ll::rustrt::rust_uv_helper_uv_timer_t_size();
16551663
let rust_handle_size = sys::size_of::<uv_timer_t>();
16561664
let output = fmt!("uv_timer_t -- foreign: %u rust: %u",
16571665
foreign_handle_size as uint, rust_handle_size);
@@ -1663,7 +1671,7 @@ pub mod test {
16631671
#[ignore(cfg(target_os = "win32"))]
16641672
fn test_uv_ll_struct_size_uv_getaddrinfo_t() {
16651673
let foreign_handle_size =
1666-
rustrt::rust_uv_helper_uv_getaddrinfo_t_size();
1674+
::uv_ll::rustrt::rust_uv_helper_uv_getaddrinfo_t_size();
16671675
let rust_handle_size = sys::size_of::<uv_getaddrinfo_t>();
16681676
let output = fmt!("uv_getaddrinfo_t -- foreign: %u rust: %u",
16691677
foreign_handle_size as uint, rust_handle_size);
@@ -1675,7 +1683,7 @@ pub mod test {
16751683
#[ignore(cfg(target_os = "win32"))]
16761684
fn test_uv_ll_struct_size_addrinfo() {
16771685
let foreign_handle_size =
1678-
rustrt::rust_uv_helper_addrinfo_size();
1686+
::uv_ll::rustrt::rust_uv_helper_addrinfo_size();
16791687
let rust_handle_size = sys::size_of::<addrinfo>();
16801688
let output = fmt!("addrinfo -- foreign: %u rust: %u",
16811689
foreign_handle_size as uint, rust_handle_size);

0 commit comments

Comments
 (0)