auto merge of #4905 : brson/rust/issue4524, r=brson

Rebase of #4895

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs
index 1da1bc60314..6e1e6a331a2 100644
--- a/src/libstd/timer.rs
+++ b/src/libstd/timer.rs
@@ -67,12 +67,12 @@ pub fn delayed_send<T: Owned>(iotask: &IoTask,
                         } else {
                             let error_msg = uv::ll::get_last_err_info(
                                 loop_ptr);
-                            die!(~"timer::delayed_send() start failed: " +
+                            fail!(~"timer::delayed_send() start failed: " +
                                 error_msg);
                         }
                     } else {
                         let error_msg = uv::ll::get_last_err_info(loop_ptr);
-                        die!(~"timer::delayed_send() init failed: " +
+                        fail!(~"timer::delayed_send() init failed: " +
                             error_msg);
                     }
                 }
@@ -157,7 +157,7 @@ extern fn delayed_send_cb(handle: *uv::ll::uv_timer_t,
         } else {
             let loop_ptr = uv::ll::get_loop_for_uv_handle(handle);
             let error_msg = uv::ll::get_last_err_info(loop_ptr);
-            die!(~"timer::sleep() init failed: "+error_msg);
+            fail!(~"timer::sleep() init failed: "+error_msg);
         }
     }
 }