---

yaml
---
r: 13489
b: refs/heads/master
c: bc507c4
h: refs/heads/master
i:
  13487: d7c8386
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6969f0f2fcd4441f694344bdd8d6f10aa9fc56ef
+refs/heads/master: bc507c4ef5a5e4da95e95c080239dbe10ffcd376
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/timer.rs

@@ -25,8 +25,6 @@ for *at least* that period of time.
 "]
 fn delayed_send<T: copy send>(iotask: iotask,
                               msecs: uint, ch: comm::chan<T>, val: T) {
-    // FIME: Looks like we don't need to spawn here
-    task::spawn() {||
         unsafe {
             let timer_done_po = comm::port::<()>();
             let timer_done_ch = comm::chan(timer_done_po);
@@ -59,7 +57,6 @@ fn delayed_send<T: copy send>(iotask: iotask,
             comm::send(ch, copy(val));
             // uv_close for this timer has been processed
             comm::recv(timer_done_po);
-        }
     };
 }
 
@@ -106,7 +103,7 @@ fn recv_timeout<T: copy send>(iotask: iotask,
     let timeout_po = comm::port::<()>();
     let timeout_ch = comm::chan(timeout_po);
     delayed_send(iotask, msecs, timeout_ch, ());
-    // FIXME: This could be written clearer
+    // FIXME: This could be written clearer (#2618)
     either::either(
         {|left_val|
             log(debug, #fmt("recv_time .. left_val %?",