about summary refs log tree commit diff
path: root/src/libstd/net_ip.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/net_ip.rs
parenta17a9d41f6bf06daacb0aedb0cb2144dc4ba1c53 (diff)
downloadrust-1e91595520d0538e6003dc9186f1b0df5c25b77a.tar.gz
rust-1e91595520d0538e6003dc9186f1b0df5c25b77a.zip
librustc: Remove `fail_unless!`
Diffstat (limited to 'src/libstd/net_ip.rs')
-rw-r--r--src/libstd/net_ip.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index 4fd06f43164..6403e0eb5c4 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -379,7 +379,7 @@ mod test {
     #[test]
     fn test_ip_ipv4_parse_and_format_ip() {
         let localhost_str = ~"127.0.0.1";
-        fail_unless!(format_addr(&v4::parse_addr(localhost_str))
+        assert!(format_addr(&v4::parse_addr(localhost_str))
                 == localhost_str)
     }
     #[test]
@@ -388,14 +388,14 @@ mod test {
         let format_result = format_addr(&v6::parse_addr(localhost_str));
         debug!("results: expected: '%s' actual: '%s'",
             localhost_str, format_result);
-        fail_unless!(format_result == localhost_str);
+        assert!(format_result == localhost_str);
     }
     #[test]
     fn test_ip_ipv4_bad_parse() {
         match v4::try_parse_addr(~"b4df00d") {
           result::Err(ref err_info) => {
             debug!("got error as expected %?", err_info);
-            fail_unless!(true);
+            assert!(true);
           }
           result::Ok(ref addr) => {
             fail!(fmt!("Expected failure, but got addr %?", addr));
@@ -408,7 +408,7 @@ mod test {
         match v6::try_parse_addr(~"::,~2234k;") {
           result::Err(ref err_info) => {
             debug!("got error as expected %?", err_info);
-            fail_unless!(true);
+            assert!(true);
           }
           result::Ok(ref addr) => {
             fail!(fmt!("Expected failure, but got addr %?", addr));
@@ -439,7 +439,7 @@ mod test {
         }
         // at least one result.. this is going to vary from system
         // to system, based on stuff like the contents of /etc/hosts
-        fail_unless!(!results.is_empty());
+        assert!(!results.is_empty());
     }
     #[test]
     #[ignore(reason = "valgrind says it's leaky")]
@@ -447,6 +447,6 @@ mod test {
         let localhost_name = ~"sjkl234m,./sdf";
         let iotask = &uv::global_loop::get();
         let ga_result = get_addr(localhost_name, iotask);
-        fail_unless!(result::is_err(&ga_result));
+        assert!(result::is_err(&ga_result));
     }
 }