about summary refs log tree commit diff
path: root/src/libstd/sync/mpsc/mpsc_queue.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/mpsc_queue.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/mpsc_queue.rs')
-rw-r--r--src/libstd/sync/mpsc/mpsc_queue.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs
index a2accb128c3..6eb7c8c5961 100644
--- a/src/libstd/sync/mpsc/mpsc_queue.rs
+++ b/src/libstd/sync/mpsc/mpsc_queue.rs
@@ -78,7 +78,7 @@ pub struct Queue<T> {
 }
 
 unsafe impl<T:Send> Send for Queue<T> { }
-unsafe impl<T: Send + 'static> Sync for Queue<T> { }
+unsafe impl<T: Send> Sync for Queue<T> { }
 
 impl<T> Node<T> {
     unsafe fn new(v: Option<T>) -> *mut Node<T> {
@@ -89,7 +89,7 @@ impl<T> Node<T> {
     }
 }
 
-impl<T: Send + 'static> Queue<T> {
+impl<T: Send> Queue<T> {
     /// Creates a new queue that is safe to share among multiple producers and
     /// one consumer.
     pub fn new() -> Queue<T> {
@@ -140,7 +140,7 @@ impl<T: Send + 'static> Queue<T> {
 
 #[unsafe_destructor]
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<T: Send + 'static> Drop for Queue<T> {
+impl<T: Send> Drop for Queue<T> {
     fn drop(&mut self) {
         unsafe {
             let mut cur = *self.tail.get();