about summary refs log tree commit diff
path: root/src/libstd/sync/mpsc/stream.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-22 10:27:08 +0000
committerbors <bors@rust-lang.org>2015-02-22 10:27:08 +0000
commitdcc6ce2c772cb851ac35cbc2ddafcae9bf2fa9fd (patch)
tree5c395b9b0e9b905648ed6de581ec601f4cc2ba9f /src/libstd/sync/mpsc/stream.rs
parenteb1b500a9a69b149295c37c2fe2c9409f406f9ea (diff)
parent380d23b5d4b9fb8f5f0ebf178590f61528b2483e (diff)
downloadrust-dcc6ce2c772cb851ac35cbc2ddafcae9bf2fa9fd.tar.gz
rust-dcc6ce2c772cb851ac35cbc2ddafcae9bf2fa9fd.zip
Auto merge of #22574 - huonw:remove-lame-statics, r=alexcirchton
Add a basic test that checks that the types catch the most glaring
errors that could occur.

cc #22444
Diffstat (limited to 'src/libstd/sync/mpsc/stream.rs')
-rw-r--r--src/libstd/sync/mpsc/stream.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs
index a194c996692..2d528662f64 100644
--- a/src/libstd/sync/mpsc/stream.rs
+++ b/src/libstd/sync/mpsc/stream.rs
@@ -74,7 +74,7 @@ enum Message<T> {
     GoUp(Receiver<T>),
 }
 
-impl<T: Send + 'static> Packet<T> {
+impl<T: Send> Packet<T> {
     pub fn new() -> Packet<T> {
         Packet {
             queue: unsafe { spsc::Queue::new(128) },
@@ -472,7 +472,7 @@ impl<T: Send + 'static> Packet<T> {
 }
 
 #[unsafe_destructor]
-impl<T: Send + 'static> Drop for Packet<T> {
+impl<T: Send> Drop for Packet<T> {
     fn drop(&mut self) {
         // Note that this load is not only an assert for correctness about
         // disconnection, but also a proper fence before the read of