about summary refs log tree commit diff
path: root/src/libstd/c_vec.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-03-28 18:39:09 -0700
committerBrian Anderson <banderson@mozilla.com>2013-03-29 16:39:08 -0700
commit1e91595520d0538e6003dc9186f1b0df5c25b77a (patch)
tree8199ebdfbabc8b0a537f7b9330716e3b9c71714a /src/libstd/c_vec.rs
parenta17a9d41f6bf06daacb0aedb0cb2144dc4ba1c53 (diff)
downloadrust-1e91595520d0538e6003dc9186f1b0df5c25b77a.tar.gz
rust-1e91595520d0538e6003dc9186f1b0df5c25b77a.zip
librustc: Remove `fail_unless!`
Diffstat (limited to 'src/libstd/c_vec.rs')
-rw-r--r--src/libstd/c_vec.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs
index 1787be75e24..113c8130349 100644
--- a/src/libstd/c_vec.rs
+++ b/src/libstd/c_vec.rs
@@ -122,7 +122,7 @@ pub unsafe fn c_vec_with_dtor<T>(base: *mut T, len: uint, dtor: @fn())
  * Fails if `ofs` is greater or equal to the length of the vector
  */
 pub fn get<T:Copy>(t: CVec<T>, ofs: uint) -> T {
-    fail_unless!(ofs < len(t));
+    assert!(ofs < len(t));
     return unsafe { *ptr::mut_offset(t.base, ofs) };
 }
 
@@ -132,7 +132,7 @@ pub fn get<T:Copy>(t: CVec<T>, ofs: uint) -> T {
  * Fails if `ofs` is greater or equal to the length of the vector
  */
 pub fn set<T:Copy>(t: CVec<T>, ofs: uint, v: T) {
-    fail_unless!(ofs < len(t));
+    assert!(ofs < len(t));
     unsafe { *ptr::mut_offset(t.base, ofs) = v };
 }
 
@@ -159,7 +159,7 @@ mod tests {
         unsafe {
             let mem = libc::malloc(n);
 
-            fail_unless!(mem as int != 0);
+            assert!(mem as int != 0);
 
             return unsafe { c_vec_with_dtor(mem as *mut u8, n as uint,
                                          || unsafe { free(mem) }) };
@@ -172,9 +172,9 @@ mod tests {
 
         set(cv, 3u, 8u8);
         set(cv, 4u, 9u8);
-        fail_unless!(get(cv, 3u) == 8u8);
-        fail_unless!(get(cv, 4u) == 9u8);
-        fail_unless!(len(cv) == 16u);
+        assert!(get(cv, 3u) == 8u8);
+        assert!(get(cv, 4u) == 9u8);
+        assert!(len(cv) == 16u);
     }
 
     #[test]
@@ -202,7 +202,7 @@ mod tests {
 
         set(cv, 0u, 32u8);
         set(cv, 1u, 33u8);
-        fail_unless!(unsafe { *p } == 32u8);
+        assert!(unsafe { *p } == 32u8);
         set(cv, 2u, 34u8); /* safety */
     }