auto merge of #10070 : alexcrichton/rust/fewer-missiles, r=brson

[rust.git] / src / libstd / rt / uv / uvio.rs

diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs
index 63abd6eb92d7c2efc86058c423bbdb22b2eb07fd..dc202ecc174aed1fa656fa6299d22186226638c2 100644 (file)
--- a/src/libstd/rt/uv/uvio.rs
+++ b/src/libstd/rt/uv/uvio.rs
@@ -228,15 +228,6 @@ fn pausible_idle_callback(&mut self) -> ~PausibleIdleCallback {
         } as ~PausibleIdleCallback
     }
 
-    fn callback_ms(&mut self, ms: u64, f: ~fn()) {
-        let mut timer =  TimerWatcher::new(self.uvio.uv_loop());
-        do timer.start(ms, 0) |timer, status| {
-            assert!(status.is_none());
-            timer.close(||());
-            f();
-        }
-    }
-
     fn remote_callback(&mut self, f: ~fn()) -> ~RemoteCallback {
         ~UvRemoteCallback::new(self.uvio.uv_loop(), f) as ~RemoteCallback
     }
@@ -1797,7 +1788,7 @@ fn get_winsize(&mut self) -> Result<(int, int), IoError> {
     }
 
     fn isatty(&self) -> bool {
-        unsafe { uvll::guess_handle(self.fd) == uvll::UV_TTY }
+        unsafe { uvll::guess_handle(self.fd) == uvll::UV_TTY as c_int }
     }
 }