test: Fix tests.

8 files changed, 27 insertions, 17 deletions

diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs
index 84b24efac96..e7503f0082c 100644
--- a/src/libstd/arc.rs
+++ b/src/libstd/arc.rs
@@ -519,7 +519,8 @@ mod tests {
             let _ = p.recv();
             do arc2.access_cond |one, cond| {
                 cond.signal();
-                fail_unless!(*one == 0); // Parent should fail when it wakes up.
+                // Parent should fail when it wakes up.
+                fail_unless!(*one == 0);
             }
         }
 
diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs
index b54c50da35c..55ec29d2337 100644
--- a/src/libstd/bitv.rs
+++ b/src/libstd/bitv.rs
@@ -1238,7 +1238,8 @@ mod tests {
 
     #[test]
     pub fn test_from_bools() {
-        fail_unless!(from_bools([true, false, true, true]).to_str() == ~"1011");
+        fail_unless!(from_bools([true, false, true, true]).to_str() ==
+            ~"1011");
     }
 
     #[test]
diff --git a/src/libstd/md4.rs b/src/libstd/md4.rs
index 3dc669da571..eb4bd6fe23f 100644
--- a/src/libstd/md4.rs
+++ b/src/libstd/md4.rs
@@ -128,7 +128,8 @@ fn test_md4() {
     fail_unless!(md4_text(~"") == ~"31d6cfe0d16ae931b73c59d7e0c089c0");
     fail_unless!(md4_text(~"a") == ~"bde52cb31de33e46245e05fbdbd6fb24");
     fail_unless!(md4_text(~"abc") == ~"a448017aaf21d8525fc10ae87aa6729d");
-    fail_unless!(md4_text(~"message digest") == ~"d9130a8164549fe818874806e1c7014b");
+    fail_unless!(md4_text(~"message digest") ==
+        ~"d9130a8164549fe818874806e1c7014b");
     fail_unless!(md4_text(~"abcdefghijklmnopqrstuvwxyz") ==
         ~"d79e1c308aa5bbcdeea8ed63df412da9");
     fail_unless!(md4_text(
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index 0739f624882..0bb8fdd3738 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -971,7 +971,8 @@ mod tests {
         fail_unless!(encode_component("") == ~"");
         fail_unless!(encode_component("http://example.com") ==
             ~"http%3A%2F%2Fexample.com");
-        fail_unless!(encode_component("foo bar% baz") == ~"foo%20bar%25%20baz");
+        fail_unless!(encode_component("foo bar% baz") ==
+            ~"foo%20bar%25%20baz");
         fail_unless!(encode_component(" ") == ~"%20");
         fail_unless!(encode_component("!") == ~"%21");
         fail_unless!(encode_component("#") == ~"%23");
@@ -1065,7 +1066,8 @@ mod tests {
 
         let mut m = LinearMap::new();
         m.insert(~"foo bar", ~[~"abc", ~"12 = 34"]);
-        fail_unless!(encode_form_urlencoded(&m) == ~"foo+bar=abc&foo+bar=12+%3D+34");
+        fail_unless!(encode_form_urlencoded(&m) ==
+            ~"foo+bar=abc&foo+bar=12+%3D+34");
     }
 
     #[test]
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index b43389b9da2..7286ce5e2bd 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -962,7 +962,9 @@ mod tests {
 
         for vec::each(pairs) |p| {
             match *p {
-                (ref a, ref b) => { fail_unless!((*a == b.desc.name.to_str())); }
+                (ref a, ref b) => {
+                    fail_unless!((*a == b.desc.name.to_str()));
+                }
             }
         }
     }
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index d008ad15006..d6e19515ba6 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -22,10 +22,6 @@ const NSEC_PER_SEC: i32 = 1_000_000_000_i32;
 pub mod rustrt {
     use super::Tm;
 
-    #[cfg(target_os = "linux")]
-    #[link_args = "-lrt"]
-    pub extern {}
-
     #[abi = "cdecl"]
     pub extern {
         pub unsafe fn get_time(sec: &mut i64, nsec: &mut i32);
@@ -1164,10 +1160,14 @@ mod tests {
         fail_unless!(test(~"6", ~"%w"));
         fail_unless!(test(~"2009", ~"%Y"));
         fail_unless!(test(~"09", ~"%y"));
-        fail_unless!(result::unwrap(strptime(~"UTC", ~"%Z")).tm_zone == ~"UTC");
-        fail_unless!(result::unwrap(strptime(~"PST", ~"%Z")).tm_zone == ~"");
-        fail_unless!(result::unwrap(strptime(~"-0000", ~"%z")).tm_gmtoff == 0);
-        fail_unless!(result::unwrap(strptime(~"-0800", ~"%z")).tm_gmtoff == 0);
+        fail_unless!(result::unwrap(strptime(~"UTC", ~"%Z")).tm_zone ==
+            ~"UTC");
+        fail_unless!(result::unwrap(strptime(~"PST", ~"%Z")).tm_zone ==
+            ~"");
+        fail_unless!(result::unwrap(strptime(~"-0000", ~"%z")).tm_gmtoff ==
+            0);
+        fail_unless!(result::unwrap(strptime(~"-0800", ~"%z")).tm_gmtoff ==
+            0);
         fail_unless!(test(~"%", ~"%%"));
     }
 
diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs
index 878696a9a90..f06f64dde01 100644
--- a/src/libstd/treemap.rs
+++ b/src/libstd/treemap.rs
@@ -790,7 +790,8 @@ mod test_treemap {
             fail_unless!(r.key.cmp(&parent.key) == Greater);
             let red = r.level == parent.level;
             if parent_red { fail_unless!(!red) } // no dual horizontal links
-            fail_unless!(red || r.level == parent.level - 1); // right red or black
+            // Right red or black
+            fail_unless!(red || r.level == parent.level - 1);
             check_left(&r.left, r);
             check_right(&r.right, r, red);
           }
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index a48dd7b4f86..fa415e0875b 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -1859,7 +1859,8 @@ pub mod test {
             // .. can't get the uv::ll::sockaddr_in6 to == 28 :/
             // .. so the type always appears to be 32 in size.. which is
             // good, i guess.. better too big than too little
-            fail_unless!((4u+foreign_handle_size as uint) == rust_handle_size);
+            fail_unless!((4u+foreign_handle_size as uint) ==
+                rust_handle_size);
         }
     }
     #[test]
@@ -1873,7 +1874,8 @@ pub mod test {
                               foreign_handle_size as uint, rust_handle_size);
             log(debug, output);
             // FIXME #1645 .. see note above about struct padding
-            fail_unless!((4u+foreign_handle_size as uint) == rust_handle_size);
+            fail_unless!((4u+foreign_handle_size as uint) ==
+                rust_handle_size);
         }
     }