auto merge of #13354 : alexcrichton/rust/fixup-some-signals, r=sfackler

This also makes the listener struct sendable again by explicitly putting the
Send bound on the relevant Rtio object.

cc #13352

1 files changed, 9 insertions, 10 deletions

diff --git a/src/libstd/io/signal.rs b/src/libstd/io/signal.rs
index 494cc6f6b02..6762e7c6a76 100644
--- a/src/libstd/io/signal.rs
+++ b/src/libstd/io/signal.rs
@@ -23,6 +23,7 @@ use clone::Clone;
 use comm::{Sender, Receiver, channel};
 use io;
 use iter::Iterator;
+use kinds::Send;
 use mem::drop;
 use option::{Some, None};
 use result::{Ok, Err};
@@ -63,25 +64,23 @@ pub enum Signum {
 ///
 /// # Example
 ///
-/// ```rust,ignore
+/// ```rust,no_run
+/// # #![allow(unused_must_use)]
 /// use std::io::signal::{Listener, Interrupt};
 ///
 /// let mut listener = Listener::new();
 /// listener.register(Interrupt);
 ///
-/// spawn({
-///     loop {
-///         match listener.rx.recv() {
-///             Interrupt => println!("Got Interrupt'ed"),
-///             _ => (),
-///         }
+/// loop {
+///     match listener.rx.recv() {
+///         Interrupt => println!("Got Interrupt'ed"),
+///         _ => (),
 ///     }
-/// });
-///
+/// }
 /// ```
 pub struct Listener {
     /// A map from signums to handles to keep the handles in memory
-    handles: ~[(Signum, ~RtioSignal)],
+    handles: ~[(Signum, ~RtioSignal:Send)],
     /// This is where all the handles send signums, which are received by
     /// the clients from the receiver.
     tx: Sender<Signum>,