1 files changed, 22 insertions, 22 deletions

diff --git a/src/libstd/flatpipes.rs b/src/libstd/flatpipes.rs
index 798c5ae57c7..734e6e83581 100644
--- a/src/libstd/flatpipes.rs
+++ b/src/libstd/flatpipes.rs
@@ -358,8 +358,8 @@ pub mod flatteners {
 
     impl<T:Copy + Owned> Unflattener<T> for PodUnflattener<T> {
         fn unflatten(&self, buf: ~[u8]) -> T {
-            assert size_of::<T>() != 0;
-            assert size_of::<T>() == buf.len();
+            fail_unless!(size_of::<T>() != 0);
+            fail_unless!(size_of::<T>() == buf.len());
             let addr_of_init: &u8 = unsafe { &*vec::raw::to_ptr(buf) };
             let addr_of_value: &T = unsafe { cast::transmute(addr_of_init) };
             copy *addr_of_value
@@ -368,7 +368,7 @@ pub mod flatteners {
 
     impl<T:Copy + Owned> Flattener<T> for PodFlattener<T> {
         fn flatten(&self, val: T) -> ~[u8] {
-            assert size_of::<T>() != 0;
+            fail_unless!(size_of::<T>() != 0);
             let val: *T = ptr::to_unsafe_ptr(&val);
             let byte_value = val as *u8;
             unsafe { vec::from_buf(byte_value, size_of::<T>()) }
@@ -521,11 +521,11 @@ pub mod bytepipes {
             let mut left = count;
             let mut bytes = ~[];
             while !self.reader.eof() && left > 0 {
-                assert left <= count;
-                assert left > 0;
+                fail_unless!(left <= count);
+                fail_unless!(left > 0);
                 let new_bytes = self.reader.read_bytes(left);
                 bytes.push_all(new_bytes);
-                assert new_bytes.len() <= left;
+                fail_unless!(new_bytes.len() <= left);
                 left -= new_bytes.len();
             }
 
@@ -578,7 +578,7 @@ pub mod bytepipes {
                 return Some(bytes);
             } else if self.buf.len() > 0 {
                 let mut bytes = ::core::util::replace(&mut self.buf, ~[]);
-                assert count > bytes.len();
+                fail_unless!(count > bytes.len());
                 match self.try_recv(count - bytes.len()) {
                     Some(rest) => {
                         bytes.push_all(rest);
@@ -589,7 +589,7 @@ pub mod bytepipes {
             } else if self.buf.is_empty() {
                 match self.port.try_recv() {
                     Some(buf) => {
-                        assert !buf.is_empty();
+                        fail_unless!(!buf.is_empty());
                         self.buf = buf;
                         return self.try_recv(count);
                     }
@@ -657,7 +657,7 @@ mod test {
         let port = serial::reader_port(reader);
 
         let res: int = port.recv();
-        assert res == 10i;
+        fail_unless!(res == 10i);
     }
 
     #[test]
@@ -671,7 +671,7 @@ mod test {
         }
 
         for int::range(0, 10) |i| {
-            assert i == port.recv()
+            fail_unless!(i == port.recv())
         }
     }
 
@@ -686,7 +686,7 @@ mod test {
         }
 
         for int::range(0, 10) |i| {
-            assert @i == port.recv()
+            fail_unless!(@i == port.recv())
         }
     }
 
@@ -703,7 +703,7 @@ mod test {
         let port = pod::reader_port(reader);
 
         let res: int = port.recv();
-        assert res == 10;
+        fail_unless!(res == 10);
     }
 
     #[test]
@@ -717,7 +717,7 @@ mod test {
         }
 
         for int::range(0, 10) |i| {
-            assert i == port.recv()
+            fail_unless!(i == port.recv())
         }
     }
 
@@ -801,7 +801,7 @@ mod test {
                 kill_ch.send(None)
             };
 
-            assert listen_res.is_ok();
+            fail_unless!(listen_res.is_ok());
         }
 
         // Client task
@@ -814,7 +814,7 @@ mod test {
             debug!("connecting");
             let iotask = &uv::global_loop::get();
             let connect_result = tcp::connect(copy addr, port, iotask);
-            assert connect_result.is_ok();
+            fail_unless!(connect_result.is_ok());
             let sock = result::unwrap(connect_result);
             let socket_buf: tcp::TcpSocketBuf = tcp::socket_buf(sock);
 
@@ -835,7 +835,7 @@ mod test {
             debug!("accepting connection");
             let accept_result = tcp::accept(conn);
             debug!("accepted");
-            assert accept_result.is_ok();
+            fail_unless!(accept_result.is_ok());
             let sock = result::unwrap(accept_result);
             res_chan.send(());
 
@@ -847,7 +847,7 @@ mod test {
             for int::range(0, 10) |i| {
                 let j = port.recv();
                 debug!("receieved %?", j);
-                assert i == j;
+                fail_unless!(i == j);
             }
 
             // The test is over!
@@ -893,7 +893,7 @@ mod test {
             let bytes = ~[];
             let port = loader(bytes);
             let res: Option<int> = port.try_recv();
-            assert res.is_none();
+            fail_unless!(res.is_none());
         }
 
         #[test]
@@ -910,7 +910,7 @@ mod test {
             let bytes = ~[0];
             let port = loader(bytes);
             let res: Option<int> = port.try_recv();
-            assert res.is_none();
+            fail_unless!(res.is_none());
         }
 
         #[test]
@@ -928,7 +928,7 @@ mod test {
             let bytes = CONTINUE.to_vec() + ~[0];
             let port = loader(bytes);
             let res: Option<int> = port.try_recv();
-            assert res.is_none();
+            fail_unless!(res.is_none());
         }
 
         #[test]
@@ -941,7 +941,7 @@ mod test {
         }
 
         fn test_try_recv_none4<P:BytePort>(+loader: PortLoader<P>) {
-            assert do task::try || {
+            fail_unless!(do task::try || {
                 const CONTINUE: [u8 * 4] = [0xAA, 0xBB, 0xCC, 0xDD];
                 // The control word is followed by a valid length,
                 // then undeserializable garbage
@@ -954,7 +954,7 @@ mod test {
                 let port = loader(bytes);
 
                 let _res: Option<int> = port.try_recv();
-            }.is_err();
+            }.is_err());
         }
 
         #[test]