about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-06-17 06:52:14 -0700
committerbors <bors@rust-lang.org>2013-06-17 06:52:14 -0700
commit6fbd5383f96cf0d79279e7ce903d3634ebe450d9 (patch)
tree0d4b94625d30029f8788d656d0ed2a19fdd3b556
parent90b999aea1a4cfdda549c2ba8462d9eac23c681a (diff)
parent93156ab7e1e04f2805e6a43c1ea60b8ca168dfe5 (diff)
downloadrust-6fbd5383f96cf0d79279e7ce903d3634ebe450d9.tar.gz
rust-6fbd5383f96cf0d79279e7ce903d3634ebe450d9.zip
auto merge of #7195 : brson/rust/timertest, r=bstrie
-rw-r--r--src/libstd/rt/uv/timer.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/uv/timer.rs b/src/libstd/rt/uv/timer.rs
index 5557a580987..cd6fc5c0a25 100644
--- a/src/libstd/rt/uv/timer.rs
+++ b/src/libstd/rt/uv/timer.rs
@@ -143,7 +143,7 @@ mod test {
             let count_ptr: *mut int = &mut count;
             let mut loop_ = Loop::new();
             let mut timer = TimerWatcher::new(&mut loop_);
-            do timer.start(10, 20) |timer, status| {
+            do timer.start(1, 2) |timer, status| {
                 assert!(status.is_none());
                 unsafe {
                     *count_ptr += 1;
@@ -166,7 +166,7 @@ mod test {
 
                             // Restart the original timer
                             let mut timer = timer;
-                            do timer.start(10, 0) |timer, _| {
+                            do timer.start(1, 0) |timer, _| {
                                 unsafe { *count_ptr += 1; }
                                 timer.close(||());
                             }