Use static string with fail!() and remove fail!(fmt!())

fail!() used to require owned strings but can handle static strings
now. Also, it can pass its arguments to fmt!() on its own, no need for
the caller to call fmt!() itself.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs
index 234982a12bc..e9fd0414244 100644
--- a/src/libstd/timer.rs
+++ b/src/libstd/timer.rs
@@ -63,13 +63,11 @@ pub fn delayed_send<T:Owned>(iotask: &IoTask,
                 } else {
                     let error_msg = uv::ll::get_last_err_info(
                         loop_ptr);
-                    fail!(~"timer::delayed_send() start failed: " +
-                        error_msg);
+                    fail!("timer::delayed_send() start failed: %s", error_msg);
                 }
             } else {
                 let error_msg = uv::ll::get_last_err_info(loop_ptr);
-                fail!(~"timer::delayed_send() init failed: " +
-                    error_msg);
+                fail!("timer::delayed_send() init failed: %s", error_msg);
             }
         }
     };
@@ -158,7 +156,7 @@ extern fn delayed_send_cb(handle: *uv::ll::uv_timer_t, status: libc::c_int) {
         } else {
             let loop_ptr = uv::ll::get_loop_for_uv_handle(handle);
             let error_msg = uv::ll::get_last_err_info(loop_ptr);
-            fail!(~"timer::sleep() init failed: "+error_msg);
+            fail!("timer::sleep() init failed: %s", error_msg);
         }
     }
 }