test: Update tests and import the prelude in some more places.

diff --git a/src/libextra/arc.rs b/src/libextra/arc.rs
index 087b28ec01e6d71c93cc6460952c0c7db9a22097..648089a552475dc64301d25c5a4a1b46ee253827 100644 (file)
--- a/src/libextra/arc.rs
+++ b/src/libextra/arc.rs
@@ -511,6 +511,7 @@ fn read<U>(&self, blk: &fn(x: &T) -> U) -> U {
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
 
     use arc::*;
     use arc;

diff --git a/src/libextra/dlist.rs b/src/libextra/dlist.rs
index c3ef1f25ad9330119686b0b924f41aee5e3f8ed8..75249b9f467ad5b4ec7c08bdfcd6b3da77a8f842 100644 (file)
--- a/src/libextra/dlist.rs
+++ b/src/libextra/dlist.rs
@@ -534,6 +534,8 @@ fn size_hint(&self) -> Option<uint> { Some(self.len()) }
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
+
     use super::*;
 
     #[test]

diff --git a/src/libextra/fileinput.rs b/src/libextra/fileinput.rs
index a9024592426fdeda3c5f28ba6a2aabf168084e0f..ec2c73251ba12fbda470d08c82bd07509d7dd300 100644 (file)
--- a/src/libextra/fileinput.rs
+++ b/src/libextra/fileinput.rs
@@ -405,6 +405,8 @@ pub fn input_vec_state(files: ~[Option<Path>],
 
 #[cfg(test)]
 mod test {
+    use core::prelude::*;
+
     use core::io::WriterUtil;
     use super::{FileInput, pathify, input_vec, input_vec_state};
 

diff --git a/src/libextra/flatpipes.rs b/src/libextra/flatpipes.rs
index 7c97cabd5891010fda95a7f9a9bea2661deeef0d..76361db7d76cfa6a4f4cbab5410ad8950898b292 100644 (file)
--- a/src/libextra/flatpipes.rs
+++ b/src/libextra/flatpipes.rs
@@ -866,6 +866,8 @@ fn test_some_tcp_stream<U:Unflattener<int>,F:Flattener<int>>(
     // Tests that the different backends behave the same when the
     // binary streaming protocol is broken
     mod broken_protocol {
+        use core::prelude::*;
+
         use flatpipes::{BytePort, FlatPort};
         use flatpipes::flatteners::PodUnflattener;
         use flatpipes::pod;

diff --git a/src/libextra/json.rs b/src/libextra/json.rs
index f56da368008d61435b71fc362c778f21bd174f37..6656c896e74c3886a9b09ac93111a4e8f3806a46 100644 (file)
--- a/src/libextra/json.rs
+++ b/src/libextra/json.rs
@@ -1327,6 +1327,8 @@ fn to_str(&self) -> ~str {
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
+
     use super::*;
 
     use core::hashmap::HashMap;

diff --git a/src/libextra/net_tcp.rs b/src/libextra/net_tcp.rs
index d0a1385b706a5e5d34d7391a04e6c76382cbdd66..894488e47e123be55dc5696c3a50a2cc2831711a 100644 (file)
--- a/src/libextra/net_tcp.rs
+++ b/src/libextra/net_tcp.rs
@@ -1440,6 +1440,8 @@ struct TcpBufferedSocketData {
 
 #[cfg(test)]
 mod test {
+    use core::prelude::*;
+
     use net::ip;
     use net::tcp::{GenericListenErr, TcpConnectErrData, TcpListenErrData};
     use net::tcp::{connect, accept, read, listen, TcpSocket, socket_buf};

diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs
index fa7621462ef70ec2be100509df4a5816e256c61f..776172262b74297e5f076accf82187ac57d8776e 100644 (file)
--- a/src/libextra/num/bigint.rs
+++ b/src/libextra/num/bigint.rs
@@ -1145,6 +1145,8 @@ fn to_uint(&self) -> uint {
 
 #[cfg(test)]
 mod biguint_tests {
+    use core::prelude::*;
+
     use super::*;
     use core::num::{IntConvertible, Zero, One, FromStrRadix};
     use core::cmp::{Less, Equal, Greater};
@@ -1611,6 +1613,8 @@ fn check(n: uint, s: &str) {
 
 #[cfg(test)]
 mod bigint_tests {
+    use core::prelude::*;
+
     use super::*;
     use core::cmp::{Less, Equal, Greater};
     use core::num::{IntConvertible, Zero, One, FromStrRadix};

diff --git a/src/libextra/num/rational.rs b/src/libextra/num/rational.rs
index d26ef06ebce174d47ffd11d5328e929497846b9c..de114a35e36be8d5f7cc74e36c5c839ce158692d 100644 (file)
--- a/src/libextra/num/rational.rs
+++ b/src/libextra/num/rational.rs
@@ -284,6 +284,8 @@ fn from_str_radix(s: &str, radix: uint) -> Option<Ratio<T>> {
 
 #[cfg(test)]
 mod test {
+    use core::prelude::*;
+
     use super::*;
     use core::num::{Zero,One,FromStrRadix,IntConvertible};
     use core::from_str::FromStr;

diff --git a/src/libextra/priority_queue.rs b/src/libextra/priority_queue.rs
index 6d41cd653ebff113d51e834743ccd3b4555dd053..a4fc30cedcdaa77eed884c08e4e76a003aef2b5c 100644 (file)
--- a/src/libextra/priority_queue.rs
+++ b/src/libextra/priority_queue.rs
@@ -185,13 +185,13 @@ fn from_vec(xs: ~[T]) -> PriorityQueue<T> {
 mod tests {
     use sort::merge_sort;
     use core::cmp::le;
-    use priority_queue::PriorityQueue::{from_vec, new};
+    use priority_queue::PriorityQueue;
 
     #[test]
     fn test_top_and_pop() {
         let data = ~[2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
         let mut sorted = merge_sort(data, le);
-        let mut heap = from_vec(data);
+        let mut heap = PriorityQueue::from_vec(data);
         while !heap.is_empty() {
             assert_eq!(heap.top(), sorted.last());
             assert_eq!(heap.pop(), sorted.pop());
@@ -200,7 +200,7 @@ fn test_top_and_pop() {
 
     #[test]
     fn test_push() {
-        let mut heap = from_vec(~[2, 4, 9]);
+        let mut heap = PriorityQueue::from_vec(~[2, 4, 9]);
         assert_eq!(heap.len(), 3);
         assert!(*heap.top() == 9);
         heap.push(11);
@@ -222,7 +222,7 @@ fn test_push() {
 
     #[test]
     fn test_push_unique() {
-        let mut heap = from_vec(~[~2, ~4, ~9]);
+        let mut heap = PriorityQueue::from_vec(~[~2, ~4, ~9]);
         assert_eq!(heap.len(), 3);
         assert!(*heap.top() == ~9);
         heap.push(~11);
@@ -244,7 +244,7 @@ fn test_push_unique() {
 
     #[test]
     fn test_push_pop() {
-        let mut heap = from_vec(~[5, 5, 2, 1, 3]);
+        let mut heap = PriorityQueue::from_vec(~[5, 5, 2, 1, 3]);
         assert_eq!(heap.len(), 5);
         assert_eq!(heap.push_pop(6), 6);
         assert_eq!(heap.len(), 5);
@@ -258,7 +258,7 @@ fn test_push_pop() {
 
     #[test]
     fn test_replace() {
-        let mut heap = from_vec(~[5, 5, 2, 1, 3]);
+        let mut heap = PriorityQueue::from_vec(~[5, 5, 2, 1, 3]);
         assert_eq!(heap.len(), 5);
         assert_eq!(heap.replace(6), 5);
         assert_eq!(heap.len(), 5);
@@ -271,7 +271,7 @@ fn test_replace() {
     }
 
     fn check_to_vec(data: ~[int]) {
-        let heap = from_vec(copy data);
+        let heap = PriorityQueue::from_vec(copy data);
         assert_eq!(merge_sort((copy heap).to_vec(), le), merge_sort(data, le));
         assert_eq!(heap.to_sorted_vec(), merge_sort(data, le));
     }
@@ -296,27 +296,27 @@ fn test_to_vec() {
     #[test]
     #[should_fail]
     #[ignore(cfg(windows))]
-    fn test_empty_pop() { let mut heap = new::<int>(); heap.pop(); }
+    fn test_empty_pop() { let mut heap = PriorityQueue::new::<int>(); heap.pop(); }
 
     #[test]
     fn test_empty_maybe_pop() {
-        let mut heap = new::<int>();
+        let mut heap = PriorityQueue::new::<int>();
         assert!(heap.maybe_pop().is_none());
     }
 
     #[test]
     #[should_fail]
     #[ignore(cfg(windows))]
-    fn test_empty_top() { let empty = new::<int>(); empty.top(); }
+    fn test_empty_top() { let empty = PriorityQueue::new::<int>(); empty.top(); }
 
     #[test]
     fn test_empty_maybe_top() {
-        let empty = new::<int>();
+        let empty = PriorityQueue::new::<int>();
         assert!(empty.maybe_top().is_none());
     }
 
     #[test]
     #[should_fail]
     #[ignore(cfg(windows))]
-    fn test_empty_replace() { let mut heap = new(); heap.replace(5); }
+    fn test_empty_replace() { let mut heap = PriorityQueue::new(); heap.replace(5); }
 }

diff --git a/src/libextra/smallintmap.rs b/src/libextra/smallintmap.rs
index 3e5e62894dfc9a7ee0370084828da36c4feea419..b2a98845b2f658beb2b9e2904bc8291e933c98c3 100644 (file)
--- a/src/libextra/smallintmap.rs
+++ b/src/libextra/smallintmap.rs
@@ -267,6 +267,8 @@ fn new() -> SmallIntSet { SmallIntSet{map: SmallIntMap::new()} }
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
+
     use super::SmallIntMap;
 
     #[test]

diff --git a/src/libextra/sort.rs b/src/libextra/sort.rs
index 2c4020e776c21c0a0e1856d3dc23f69990a544b1..388f321d9ea87e67d92696bf1f2e13ba74398adf 100644 (file)
--- a/src/libextra/sort.rs
+++ b/src/libextra/sort.rs
@@ -746,6 +746,8 @@ fn shift_vec<T:Copy>(dest: &mut [T],
 
 #[cfg(test)]
 mod test_qsort3 {
+    use core::prelude::*;
+
     use sort::*;
 
     use core::vec;
@@ -788,6 +790,8 @@ fn test() {
 
 #[cfg(test)]
 mod test_qsort {
+    use core::prelude::*;
+
     use sort::*;
 
     use core::int;
@@ -852,6 +856,7 @@ fn test_simple() {
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
 
     use sort::*;
 
@@ -920,6 +925,8 @@ fn ile(x: &(&'static str), y: &(&'static str)) -> bool
 
 #[cfg(test)]
 mod test_tim_sort {
+    use core::prelude::*;
+
     use sort::tim_sort;
     use core::rand::RngUtil;
 
@@ -1011,6 +1018,8 @@ fn test_bad_Ord_impl() {
 
 #[cfg(test)]
 mod big_tests {
+    use core::prelude::*;
+
     use sort::*;
     use core::rand::RngUtil;
 

diff --git a/src/libextra/std.rc b/src/libextra/std.rc
index 7f9902dfc8c531aa133d3b370c30af8e1966041a..a23a547634242742da10dc510975147d42cb4721 100644 (file)
--- a/src/libextra/std.rc
+++ b/src/libextra/std.rc
@@ -36,6 +36,8 @@ extern mod core(name = "std", vers = "0.7-pre");
 use core::{str, unstable};
 use core::str::{StrSlice, OwnedStr};
 
+pub use core::os;
+
 pub mod uv_ll;
 
 // General io and system-services modules

diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs
index dc7f891b2593db6a1327aec8b9885e8a3e48ac3a..9e0ebc0222102c55b62cd308dbff5a1fa439d4ce 100644 (file)
--- a/src/libextra/sync.rs
+++ b/src/libextra/sync.rs
@@ -711,6 +711,7 @@ fn read<U>(&self, blk: &fn() -> U) -> U { blk() }
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
 
     use sync::*;
 

diff --git a/src/libextra/tempfile.rs b/src/libextra/tempfile.rs
index d7ee326f2ffb5e3e420613a8b766bdab60fd5dcb..be9b920c592bf856bcb2bff204d69ed2d2538788 100644 (file)
--- a/src/libextra/tempfile.rs
+++ b/src/libextra/tempfile.rs
@@ -27,6 +27,8 @@ pub fn mkdtemp(tmpdir: &Path, suffix: &str) -> Option<Path> {
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
+
     use tempfile::mkdtemp;
     use tempfile;
     use core::os;

diff --git a/src/libextra/timer.rs b/src/libextra/timer.rs
index 6a36d674279a2cff18466d3fd23e3d079391a70f..75caf1a4829e08c08010a2ae76e5264095aa4122 100644 (file)
--- a/src/libextra/timer.rs
+++ b/src/libextra/timer.rs
@@ -175,6 +175,8 @@ pub fn recv_timeout<T:Copy + Owned>(iotask: &IoTask,
 
 #[cfg(test)]
 mod test {
+    use core::prelude::*;
+
     use timer::*;
     use uv;
     use core::cell::Cell;

diff --git a/src/libextra/treemap.rs b/src/libextra/treemap.rs
index f4257070e19848cd5565b49890a294b0c2e51fd1..973d1faa9a6e5d9d938f88db84344d4be90fcfdc 100644 (file)
--- a/src/libextra/treemap.rs
+++ b/src/libextra/treemap.rs
@@ -699,6 +699,8 @@ fn heir_swap<K: TotalOrd, V>(node: &mut ~TreeNode<K, V>,
 
 #[cfg(test)]
 mod test_treemap {
+    use core::prelude::*;
+
     use core::iterator::*;
     use super::*;
     use core::rand::RngUtil;
@@ -1017,6 +1019,7 @@ fn test_lazy_iterator() {
 
 #[cfg(test)]
 mod test_set {
+    use core::prelude::*;
     use core::iterator::*;
     use super::*;
 

diff --git a/src/libextra/uv_ll.rs b/src/libextra/uv_ll.rs
index 014dea220292feff519e7dd89bfed4ba1bb4ee1f..5be8dd514de43df07a39b5f115cc9db481f10e7c 100644 (file)
--- a/src/libextra/uv_ll.rs
+++ b/src/libextra/uv_ll.rs
@@ -1224,6 +1224,7 @@ pub unsafe fn addrinfo_as_sockaddr_in6(input: *addrinfo) -> *sockaddr_in6 {
 
 #[cfg(test)]
 mod test {
+    use core::prelude::*;
     use core::comm::{SharedChan, stream, GenericChan, GenericPort};
     use super::*;
 

diff --git a/src/test/auxiliary/extern-crosscrate-source.rs b/src/test/auxiliary/extern-crosscrate-source.rs
index c7e8e8991359551944f2251f2fa81da151ef6ca7..3c81c787a09a2155187677da3815f479b759f3b2 100644 (file)
--- a/src/test/auxiliary/extern-crosscrate-source.rs
+++ b/src/test/auxiliary/extern-crosscrate-source.rs
@@ -15,9 +15,7 @@
 
 pub mod rustrt {
     pub extern {
-        pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t)
-                                               -> libc::uintptr_t,
-                             data: libc::uintptr_t)
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
                              -> libc::uintptr_t;
     }
 }

diff --git a/src/test/run-pass/const-cast.rs b/src/test/run-pass/const-cast.rs
index 2f7ccfe2a3a235931e8c92f07bd7fc9edb530c4d..1c8e92b91cd1bbf3378a34205a9f00384c457db7 100644 (file)
--- a/src/test/run-pass/const-cast.rs
+++ b/src/test/run-pass/const-cast.rs
@@ -10,7 +10,7 @@
 
 extern fn foo() {}
 
-static x: extern "C" fn() = foo;
+static x: *u8 = foo;
 static y: *libc::c_void = x as *libc::c_void;
 static a: &'static int = &10;
 static b: *int = a as *int;

diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/run-pass/const-cross-crate-extern.rs
index 66db6c824bc01d281c1166afab5ebaf706055b23..5281c217626895dd0255226bafc784f34b7d17ad 100644 (file)
--- a/src/test/run-pass/const-cross-crate-extern.rs
+++ b/src/test/run-pass/const-cross-crate-extern.rs
@@ -13,7 +13,7 @@
 
 extern mod cci_const;
 use cci_const::bar;
-static foo: extern "C" fn() = bar;
+static foo: *u8 = bar;
 
 pub fn main() {
     assert_eq!(foo, cci_const::bar);

diff --git a/src/test/run-pass/const-extern-function.rs b/src/test/run-pass/const-extern-function.rs
index 513f93a6760566d9d401133f6464457d2381434e..9a8104cb14f719a3d2281dc3f424e21c7c9be4c1 100644 (file)
--- a/src/test/run-pass/const-extern-function.rs
+++ b/src/test/run-pass/const-extern-function.rs
@@ -10,7 +10,7 @@
 
 extern fn foopy() {}
 
-static f: extern "C" fn() = foopy;
+static f: *u8 = foopy;
 static s: S = S { f: foopy };
 
 struct S {

diff --git a/src/test/run-pass/extern-call-deep.rs b/src/test/run-pass/extern-call-deep.rs
index 2e95873b60df455282f59b99e74f2e5ecf472a0b..6831048bee41d3d9fd2821fccaa8bea54a5aae9e 100644 (file)
--- a/src/test/run-pass/extern-call-deep.rs
+++ b/src/test/run-pass/extern-call-deep.rs
@@ -10,9 +10,7 @@
 
 mod rustrt {
     pub extern {
-        pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t)
-                                               -> libc::uintptr_t,
-                             data: libc::uintptr_t)
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
                              -> libc::uintptr_t;
     }
 }

diff --git a/src/test/run-pass/extern-call-deep2.rs b/src/test/run-pass/extern-call-deep2.rs
index 6ad1c531d9a199636178676a0081fa82856dc26b..4c5d4218b1fce456febced41931a06f3735edcaf 100644 (file)
--- a/src/test/run-pass/extern-call-deep2.rs
+++ b/src/test/run-pass/extern-call-deep2.rs
@@ -10,9 +10,7 @@
 
 mod rustrt {
     pub extern {
-        pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t)
-                                               -> libc::uintptr_t,
-                             data: libc::uintptr_t)
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
                              -> libc::uintptr_t;
     }
 }

diff --git a/src/test/run-pass/extern-call-scrub.rs b/src/test/run-pass/extern-call-scrub.rs
index 2caf4cbf2bc74ddb26a401ae00a63cde825d1ac5..5c4d594476ff378b3262c3bf60358e62ec2d48e4 100644 (file)
--- a/src/test/run-pass/extern-call-scrub.rs
+++ b/src/test/run-pass/extern-call-scrub.rs
@@ -14,9 +14,7 @@
 
 mod rustrt {
     pub extern {
-        pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t)
-                                               -> libc::uintptr_t,
-                             data: libc::uintptr_t)
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
                              -> libc::uintptr_t;
     }
 }

diff --git a/src/test/run-pass/extern-call.rs b/src/test/run-pass/extern-call.rs
index 6c36c4aa8f6298100c2ac8a27d7c4de06069e2c5..ec335cf8a82b8d503d0a26b2d58193fcfaf4b442 100644 (file)
--- a/src/test/run-pass/extern-call.rs
+++ b/src/test/run-pass/extern-call.rs
@@ -10,9 +10,7 @@
 
 mod rustrt {
     pub extern {
-        pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t)
-                                               -> libc::uintptr_t,
-                             data: libc::uintptr_t)
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
                              -> libc::uintptr_t;
     }
 }

diff --git a/src/test/run-pass/extern-stress.rs b/src/test/run-pass/extern-stress.rs
index b12295ab57684490f1b8e281187d6c071a81ff99..4257f2b2435f558380e13e29c442d36d844c0645 100644 (file)
--- a/src/test/run-pass/extern-stress.rs
+++ b/src/test/run-pass/extern-stress.rs
@@ -13,9 +13,7 @@
 
 mod rustrt {
     pub extern {
-        pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t)
-                                               -> libc::uintptr_t,
-                             data: libc::uintptr_t)
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
                              -> libc::uintptr_t;
     }
 }

diff --git a/src/test/run-pass/extern-take-value.rs b/src/test/run-pass/extern-take-value.rs
index c3fe458802d4bf2552ce73cfcc96eb4a29982fe5..542686c9099f1d1f469ce8f034de1cfad95c94b2 100644 (file)
--- a/src/test/run-pass/extern-take-value.rs
+++ b/src/test/run-pass/extern-take-value.rs
@@ -15,10 +15,10 @@
 }
 
 pub fn main() {
-    // extern functions are extern function types
-    let a: extern "C" fn() = f;
-    let b: extern "C" fn() = f;
-    let c: extern "C" fn() = g;
+    // extern functions are *u8 types
+    let a: *u8 = f;
+    let b: *u8 = f;
+    let c: *u8 = g;
 
     assert_eq!(a, b);
     assert!(a != c);

diff --git a/src/test/run-pass/extern-yield.rs b/src/test/run-pass/extern-yield.rs
index 16b1c7cd6f40ff6c7afe0c18d24a27d13c1f45fa..b0c44030a17249b2c926f446be60fe0db0ffe76e 100644 (file)
--- a/src/test/run-pass/extern-yield.rs
+++ b/src/test/run-pass/extern-yield.rs
@@ -10,9 +10,7 @@
 
 mod rustrt {
     pub extern {
-        pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t)
-                                               -> libc::uintptr_t,
-                             data: libc::uintptr_t)
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
                              -> libc::uintptr_t;
     }
 }

diff --git a/src/test/run-pass/foreign-call-no-runtime.rs b/src/test/run-pass/foreign-call-no-runtime.rs
index 67efca194d5274fea1f3c3d018b4a2b30fcddcd5..6ff8b24ab833658ad4a79ae3e71516af6d2475f0 100644 (file)
--- a/src/test/run-pass/foreign-call-no-runtime.rs
+++ b/src/test/run-pass/foreign-call-no-runtime.rs
@@ -1,9 +1,7 @@
 use std::unstable::run_in_bare_thread;
 
 extern {
-    pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t)
-                                           -> libc::uintptr_t,
-                         data: libc::uintptr_t) -> libc::uintptr_t;
+    pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) -> libc::uintptr_t;
 }
 
 pub fn main() {