Update libuv.

1 files changed, 35 insertions, 43 deletions

diff --git a/src/libstd/uv.rs b/src/libstd/uv.rs
index d04331e00b3..27f2a3c54a8 100644
--- a/src/libstd/uv.rs
+++ b/src/libstd/uv.rs
@@ -107,7 +107,7 @@ fn unref(loop: *loop_t) {
 fn sanity_check() {
     fn check_size(t: str, uv: ctypes::size_t, rust: ctypes::size_t) {
         #debug("size of %s: uv: %u, rust: %u", t, uv, rust);
-        assert uv == rust;
+        assert uv <= rust;
     }
     check_size("idle_t",
                helpers::rust_uv_size_of_idle_t(),
@@ -144,53 +144,45 @@ fn idle_new() -> idle_t {
     }
 }
 
-#[cfg(target_os = "linux")]
-#[cfg(target_os = "macos")]
-#[cfg(target_os = "freebsd")]
-// FIXME: We're out of date on libuv and not testing
-// it on windows presently. This needs to change.
-mod os {
+#[cfg(test)]
+mod tests {
 
-    #[cfg(test)]
-    mod tests {
+    #[test]
+    fn test_sanity_check() {
+        sanity_check();
+    }
+
+    // From test-ref.c
+    mod test_ref {
+
+        #[test]
+        fn ref() {
+            let loop = loop_new();
+            run(loop);
+            loop_delete(loop);
+        }
 
         #[test]
-        fn test_sanity_check() {
-            sanity_check();
+        fn idle_ref() {
+            let loop = loop_new();
+            let h = idle_new();
+            idle_init(loop, ptr::addr_of(h));
+            idle_start(ptr::addr_of(h), ptr::null());
+            unref(loop);
+            run(loop);
+            loop_delete(loop);
         }
 
-        // From test-ref.c
-        mod test_ref {
-
-            #[test]
-            fn ref() {
-                let loop = loop_new();
-                run(loop);
-                loop_delete(loop);
-            }
-
-            #[test]
-            fn idle_ref() {
-                let loop = loop_new();
-                let h = idle_new();
-                idle_init(loop, ptr::addr_of(h));
-                idle_start(ptr::addr_of(h), ptr::null());
-                unref(loop);
-                run(loop);
-                loop_delete(loop);
-            }
-
-            #[test]
-            fn async_ref() {
-                /*
-                let loop = loop_new();
-                let h = async_new();
-                async_init(loop, ptr::addr_of(h), ptr::null());
-                unref(loop);
-                run(loop);
-                loop_delete(loop);
-                */
-            }
+        #[test]
+        fn async_ref() {
+            /*
+            let loop = loop_new();
+            let h = async_new();
+            async_init(loop, ptr::addr_of(h), ptr::null());
+            unref(loop);
+            run(loop);
+            loop_delete(loop);
+            */
         }
     }
 }