From e6fa2d09de3f20998ee83bc88209e95299b2ce41 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 28 Oct 2013 19:51:28 -0700
Subject: [PATCH] std: Move the SendDeferred trait to std::comm

---
 src/libstd/comm.rs    | 7 ++++++-
 src/libstd/rt/comm.rs | 8 +-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/libstd/comm.rs b/src/libstd/comm.rs
index 7212635233f..6f788e69cc9 100644
--- a/src/libstd/comm.rs
+++ b/src/libstd/comm.rs
@@ -17,7 +17,6 @@ Message passing
 use clone::Clone;
 use kinds::Send;
 use option::Option;
-pub use rt::comm::SendDeferred;
 use rtcomm = rt::comm;
 
 /// A trait for things that can send multiple messages.
@@ -33,6 +32,12 @@ pub trait GenericSmartChan<T> {
     fn try_send(&self, x: T) -> bool;
 }
 
+/// Trait for non-rescheduling send operations, similar to `send_deferred` on ChanOne.
+pub trait SendDeferred<T> {
+    fn send_deferred(&self, val: T);
+    fn try_send_deferred(&self, val: T) -> bool;
+}
+
 /// A trait for things that can receive multiple messages.
 pub trait GenericPort<T> {
     /// Receives a message, or fails if the connection closes.
diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs
index 6319fdead17..ca8aec38b90 100644
--- a/src/libstd/rt/comm.rs
+++ b/src/libstd/rt/comm.rs
@@ -23,7 +23,7 @@ use select::{Select, SelectPort};
 use unstable::atomics::{AtomicUint, AtomicOption, Acquire, Relaxed, SeqCst};
 use unstable::sync::UnsafeArc;
 use util::Void;
-use comm::{GenericChan, GenericSmartChan, GenericPort, Peekable};
+use comm::{GenericChan, GenericSmartChan, GenericPort, Peekable, SendDeferred};
 use cell::Cell;
 use clone::Clone;
 use tuple::ImmutableTuple;
@@ -427,12 +427,6 @@ impl<T> Drop for PortOne<T> {
     }
 }
 
-/// Trait for non-rescheduling send operations, similar to `send_deferred` on ChanOne.
-pub trait SendDeferred<T> {
-    fn send_deferred(&self, val: T);
-    fn try_send_deferred(&self, val: T) -> bool;
-}
-
 struct StreamPayload<T> {
     val: T,
     next: PortOne<StreamPayload<T>>